Include precompiled versions of .ui files

These are smaller, and a faster to process than .ui files.
buildertool: Add a precompile command
2021-12-14 01:51:22 -05:00 · 2021-12-14 01:51:22 -05:00
669 changed files with 107086 additions and 126301 deletions
@@ -25,7 +25,7 @@ variables:
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v36"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v35"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"

 .only-default:
@@ -88,7 +88,7 @@ fedora-x86_64:
    - meson compile -C _build
    - meson install -C _build
    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
-    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
+    - meson compile -C _build_hello
    - .gitlab-ci/run-tests.sh _build x11
    - .gitlab-ci/run-tests.sh _build wayland
    - .gitlab-ci/run-tests.sh _build waylandgles
@@ -156,11 +156,6 @@ msys2-mingw64:
  variables:
    MSYSTEM: "MINGW64"
    CHERE_INVOKING: "yes"
-  artifacts:
-    when: always
-    expose_as: 'Windows_DLL_MSYS2_64_bit_toolchain'
-    paths:
-      - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"

 macos:
  extends: .only-default
@@ -95,8 +95,6 @@ RUN dnf -y install \
    weston-libs \
    which \
    xorg-x11-server-Xvfb \
- && dnf install -y 'dnf-command(builddep)' \
- && dnf builddep -y wayland \
 && dnf clean all

 # Enable sudo for wheel users
@@ -6,7 +6,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar

 :: FIXME: make warnings fatal
 pip3 install --upgrade --user meson==0.59 || goto :error
-meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
+meson -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error

 goto :EOF
@@ -15,9 +15,9 @@ pacman --noconfirm -Suy
 pacman --noconfirm -S --needed \
    base-devel \
    git \
-    mingw-w64-$MSYS2_ARCH-cc \
+    mingw-w64-$MSYS2_ARCH-toolchain \
    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkgconf \
+    mingw-w64-$MSYS2_ARCH-pkg-config \
    mingw-w64-$MSYS2_ARCH-gobject-introspection \
    mingw-w64-$MSYS2_ARCH-meson \
    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
@@ -30,9 +30,8 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-libepoxy \
    mingw-w64-$MSYS2_ARCH-pango \
    mingw-w64-$MSYS2_ARCH-fribidi \
-    mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-python-gobject
+    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
+    mingw-w64-$MSYS2_ARCH-shared-mime-info

 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -73,5 +72,3 @@ unset CCACHE_DISABLE

 ninja -C _build
 ccache --show-stats
-
-tar zcf _build/gtkdll.tar.gz _build/gtk/libgtk*.dll
@@ -1,194 +1,8 @@
-Overview of Changes in 4.6.1, 11-02-2022
-========================================
-
-* GtkFontChooser:
- - Stop using PangoFc api
- - Fix a crash
- - Use new HarfBuzz api
-
-* GtkMenuButton:
- - Update accessible description
-
-* GtkTextView:
- - Fix intra-widget dnd
-
-* Printing:
- - Fix an fd leak
-
-* Input:
- - Make sure input methods get focus-in events
- - Always flush events to avoid scroll event pileup
- - Support hold events
- - Update keysyms from libxkbcommon
-
-* Theme:
- - Improve text selection legibility
-
-* Introspection:
- - Add missing nullable annotations everywhere
-
-* Build:
- - Make stack noexec again
- - Avoid symbol leaks
- - Drop unneeded script data
-
-* Windows:
- - Stop using WM_SYNCPAINT
- - Relax check for GL 3.x legacy contexts
- - Use native apis for language names
- - Rewrite the keymap code
- - Use the GL renderer by default
-
-* Wayland:
- - Fix support for the new high-contrast setting
- - Avoid redundant scale changes
- - Fix DND hotspot handling
- - Don't always restore the saved size when floating
-
-* MacOS:
- - Various performance improvements
-
-* Translation updates:
- Brazilian Portuguese
- Catalan
- Chinese (China)
- Galician
- Hebrew
- Japanese
- Lithuanian
- Persian
- Polish
- Portuguese
- Russian
- Slovenian
- Spanish
- Ukrainian
-
-
-Overview of Changes in 4.6.0, 30-12-2021
-========================================
-
-* GtkProgressBar:
- - Fix handling of "inverted"
-
-* GtkLabel:
- - Add a "natural wrap mode" property to influence how
-   natural width is determined
-
-* GtkTextView
- - Scroll insertion on-screen after undo / redo
-
-* gsk:
- - Abort region diffing when changes are too complex
-
-* gdk:
- - Avoid compressing discrete scroll events
- - Fix problems with hiding windows
- - Improve GL and GLES version checks
-
-* Wayland:
- - Support new high-contrast setting
-
-* Inspector:
- - Add DND inspection support
-
-* build:
- - Avoid deprecated meson apis
-
-* Translation updates
- Galician
- Portuguese
- Ukrainian
-
-
-Overview of Changes in 4.5.1, 16-12-2021
-========================================
-
-* GtkWidget sizing has been rewritten to implement
-  width-for-height more properly. This had some fallout,
-  and some widgets may still not react kindly to the
-  new way of doing things.
-
-  See https://blog.gtk.org/2021/12/03/sizable-news/
-  for details, and please file issues if you notice fallout.
+Overview of Changes
+===================

 * Rename git `master` branch to `main`

-* Css:
- - Fully support font-variant-caps
- - Fix a crash with gradients
-
-* Make various widgets activatable:
- - GtkComboBox
- - GtkDropDown
-
-* GtkPopover:
- - Make focus indicators not disappear
-
-* GtkTextView:
- - Don't leave embedded children stranded when scrolling
- - Don't insert Emoji into non-editable textviews
- - Fix Emoji chooser positioning
- - Fix problems with pasting text
- - Improve scroll-to-mark behavior
- - Support right-aligned, centered and decimal tabs
- - Make child anchor replacement character settable
- - Provide more context to input methods
-
-* GtkDragIcon:
- - Provide default icons for paintables and files
-
-* GtkBuilder:
- - Speed up template precompilation
-
-* Actions:
- - Reduce allocations during signal emissions
- - Avoid duplication and unnecessary recursion
-
-* Inspector:
- - Show the selected im-module in the General tab
- - Add a clipboard viewer
- - Make the recorder record events too
- - Add a graph visualizing gtk_widget_measure()
-
-* Gsk:
- - Fix hexbox rendering
- - Fix transformed linear gradient rendering
-
-* Printing:
- - Fix dialog-less printing
-
-* Windows:
- - Use the common EGL setup code
- - Respect GDK_DEBUG=gl-egl
- - Fix AeroSnap indicator and positioning
-
-* X11:
- - Improve behavior of windows drags on headerbar controls
- - Trap errors for RANDR changes
- - Fix problems with drag icons
-
-* Wayland:
- - Ensure we prefer the Wayland im-module over others
-
-* Translation updates
- Basque
- Catalan
- Croatian
- Friulian
- Galician
- Hebrew
- Icelandic
- Italian
- Latvian
- Lithuanian
- Occitan
- Persian
- Portuguese
- Spanish
- Swedish
- Ukrainian
-
 Overview of Changes in 4.5.0
 ============================

@@ -43,8 +43,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                }
            ]
        },
@@ -43,8 +43,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                }
            ]
        },
@@ -43,8 +43,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                }
            ]
        },
@@ -13,7 +13,7 @@ if 'DESTDIR' not in os.environ:

    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-    gtk_mediamodule_dir = os.path.join(gtk_moduledir, 'media')
+    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')

    print('Compiling GSettings schemas...')
    glib_compile_schemas = subprocess.check_output(['pkg-config',
@@ -40,6 +40,6 @@ if 'DESTDIR' not in os.environ:
        gio_querymodules = 'gio-querymodules'
    subprocess.call([gio_querymodules, gtk_printmodule_dir])

-    print('Updating module cache for media backends...')
-    os.makedirs(gtk_mediamodule_dir, exist_ok=True)
-    subprocess.call([gio_querymodules, gtk_mediamodule_dir])
+    print('Updating module cache for input methods...')
+    os.makedirs(gtk_immodule_dir, exist_ok=True)
+    subprocess.call([gio_querymodules, gtk_immodule_dir])
@@ -17,7 +17,7 @@ executable('gtk4-constraint-editor',
  c_args: common_cflags,
  dependencies: libgtk_dep,
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: false,
 )
@@ -24,7 +24,6 @@ do_cursors (GtkWidget *do_widget)

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

  return window;
 }
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define CURVE_TYPE_EDITOR (curve_editor_get_type ())
-G_DECLARE_FINAL_TYPE (CurveEditor, curve_editor, CURVE, EDITOR, GtkWidget)
-
-GtkWidget *       curve_editor_new              (void);
-
-void              curve_editor_set_edit         (CurveEditor *self,
-                                                 gboolean     edit);
-
-void              curve_editor_set_path         (CurveEditor *self,
-                                                 GskPath     *path);
-
-GskPath *         curve_editor_get_path         (CurveEditor *self);
-
-void              curve_editor_set_stroke       (CurveEditor *self,
-                                                 GskStroke   *stroke);
-
-const GskStroke * curve_editor_get_stroke       (CurveEditor *self);
-
-
-void              curve_editor_set_color        (CurveEditor *self,
-                                                 GdkRGBA     *color);
-
-const GdkRGBA *   curve_editor_get_color        (CurveEditor *self);
-
-gboolean          curve_editor_get_show_outline (CurveEditor *self);
-
-void              curve_editor_set_show_outline (CurveEditor *self,
-                                                 gboolean     show_outline);
-
-G_END_DECLS
@@ -1,272 +0,0 @@
-/* Path/Curve Editor
- *
- * This demo shows an elaborate curve editor that you would expect to find
- * in a vector graphics editor. It is built on top of GTK's path APIs.
- */
-
-#include <gtk/gtk.h>
-#include "curve-editor.h"
-
-
-static GskPath *
-make_circle_path (void)
-{
-  float w = 310;
-  float h = 310;
-  float cx = w / 2;
-  float cy = h / 2;
-  float pad = 20;
-  float r = (w - 2 * pad) / 2;
-  float k = 0.55228;
-  float kr = k  * r;
-  GskPathBuilder *builder;
-
-  builder = gsk_path_builder_new ();
-
-  gsk_path_builder_move_to (builder,  cx, pad);
-  gsk_path_builder_curve_to (builder, cx + kr, pad,
-                                      w - pad, cy - kr,
-                                      w - pad, cy);
-  gsk_path_builder_curve_to (builder, w - pad, cy + kr,
-                                      cx + kr, h - pad,
-                                      cx, h - pad);
-  gsk_path_builder_curve_to (builder, cx - kr, h - pad,
-                                      pad, cy + kr,
-                                      pad, cy);
-  gsk_path_builder_curve_to (builder, pad, cy - kr,
-                                      cx - kr, pad,
-                                      cx, pad);
-  gsk_path_builder_close (builder);
-
-  return gsk_path_builder_free_to_path (builder);
-}
-
-static void
-edit_changed (GtkToggleButton *button,
-              GParamSpec      *pspec,
-              CurveEditor     *editor)
-{
-  curve_editor_set_edit (editor, gtk_toggle_button_get_active (button));
-}
-
-static void
-reset (GtkButton   *button,
-       CurveEditor *editor)
-{
-  GskPath *path;
-
-  path = make_circle_path ();
-  curve_editor_set_path (editor, path);
-  gsk_path_unref (path);
-}
-
-static void
-line_width_changed (GtkSpinButton *spin,
-                    CurveEditor   *editor)
-{
-  GskStroke *stroke;
-
-  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
-  gsk_stroke_set_line_width (stroke, gtk_spin_button_get_value (spin));
-  curve_editor_set_stroke (editor, stroke);
-  gsk_stroke_free (stroke);
-}
-
-static void
-cap_changed (GtkDropDown *combo,
-             GParamSpec  *pspec,
-             CurveEditor *editor)
-{
-  GskStroke *stroke;
-
-  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
-  gsk_stroke_set_line_cap (stroke, (GskLineCap)gtk_drop_down_get_selected (combo));
-  curve_editor_set_stroke (editor, stroke);
-  gsk_stroke_free (stroke);
-}
-
-static void
-join_changed (GtkDropDown *combo,
-              GParamSpec  *pspec,
-              CurveEditor *editor)
-{
-  GskStroke *stroke;
-
-  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
-  gsk_stroke_set_line_join (stroke, (GskLineJoin)gtk_drop_down_get_selected (combo));
-  curve_editor_set_stroke (editor, stroke);
-  gsk_stroke_free (stroke);
-}
-
-static void
-color_changed (GtkColorChooser *chooser,
-               GParamSpec      *pspec,
-               CurveEditor     *editor)
-{
-  GdkRGBA color;
-
-  gtk_color_chooser_get_rgba (chooser, &color);
-  curve_editor_set_color (editor, &color);
-}
-
-static void
-stroke_toggled (GtkCheckButton *button,
-                CurveEditor    *editor)
-{
-  curve_editor_set_show_outline (editor, gtk_check_button_get_active (button));
-  gtk_widget_queue_draw (GTK_WIDGET (editor));
-}
-
-static void
-limit_changed (GtkSpinButton *spin,
-               CurveEditor   *editor)
-{
-  GskStroke *stroke;
-
-  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
-  gsk_stroke_set_miter_limit (stroke, gtk_spin_button_get_value (spin));
-  curve_editor_set_stroke (editor, stroke);
-  gsk_stroke_free (stroke);
-}
-
-static void
-dashes_changed (GtkEntry    *entry,
-                GParamSpec  *spec,
-                CurveEditor *editor)
-{
-  const char *text;
-  char **split;
-  GArray *dash;
-  GskStroke *stroke;
-
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
-  split = g_strsplit (text, " ", 0);
-
-  dash = g_array_new (FALSE, FALSE, sizeof (float));
-  for (int i = 0; split[i] != NULL; i++)
-    {
-      double d;
-      char *endp = 0;
-
-      d = g_strtod (split[i], &endp);
-      if (*endp == '\0')
-        g_array_append_vals (dash, (float[1]) { d }, 1);
-    }
-
-  g_strfreev (split);
-
-  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
-  gsk_stroke_set_dash (stroke, (const float *)dash->data, dash->len);
-  curve_editor_set_stroke (editor, stroke);
-  gsk_stroke_free (stroke);
-
-  g_array_free (dash, TRUE);
-}
-
-GtkWidget *
-do_curve (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *demo;
-  GtkWidget *edit_toggle;
-  GtkWidget *reset_button;
-  GtkWidget *titlebar;
-  GtkWidget *stroke_toggle;
-  GtkWidget *line_width_spin;
-  GtkWidget *stroke_button;
-  GtkWidget *popover;
-  GtkWidget *grid;
-  GtkWidget *cap_combo;
-  GtkWidget *join_combo;
-  GtkWidget *color_button;
-  GtkWidget *limit_spin;
-  GtkWidget *dash_entry;
-
-  if (!window)
-    {
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Curve Editor");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-      gtk_window_set_default_size (GTK_WINDOW (window), 315, 350);
-
-      edit_toggle = gtk_toggle_button_new ();
-      gtk_button_set_icon_name (GTK_BUTTON (edit_toggle), "document-edit-symbolic");
-
-      reset_button = gtk_button_new_from_icon_name ("edit-undo-symbolic");
-
-      stroke_button = gtk_menu_button_new ();
-      gtk_menu_button_set_icon_name (GTK_MENU_BUTTON (stroke_button), "open-menu-symbolic");
-      popover = gtk_popover_new ();
-      gtk_menu_button_set_popover (GTK_MENU_BUTTON (stroke_button), popover);
-
-      grid = gtk_grid_new ();
-      gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-      gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-      gtk_popover_set_child (GTK_POPOVER (popover), grid);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Color:"), 0, 0, 1, 1);
-      color_button = gtk_color_button_new_with_rgba (&(GdkRGBA){ 0., 0., 0., 1.});
-      gtk_grid_attach (GTK_GRID (grid), color_button, 1, 0, 1, 1);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line width:"), 0, 1, 1, 1);
-      line_width_spin = gtk_spin_button_new_with_range (1, 20, 1);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (line_width_spin), 1);
-      gtk_grid_attach (GTK_GRID (grid), line_width_spin, 1, 1, 1, 1);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line cap:"), 0, 2, 1, 1);
-      cap_combo = gtk_drop_down_new_from_strings ((const char *[]){"Butt", "Round", "Square", NULL});
-      gtk_grid_attach (GTK_GRID (grid), cap_combo, 1, 2, 1, 1);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line join:"), 0, 3, 1, 1);
-      join_combo = gtk_drop_down_new_from_strings ((const char *[]){"Miter", "Miter-clip", "Round", "Bevel", "Arcs", NULL});
-      gtk_grid_attach (GTK_GRID (grid), join_combo, 1, 3, 1, 1);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Miter limit:"), 0, 4, 1, 1);
-      limit_spin = gtk_spin_button_new_with_range (0, 10, 1);
-      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (limit_spin), 1);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (limit_spin), 4);
-      gtk_grid_attach (GTK_GRID (grid), limit_spin, 1, 4, 1, 1);
-
-      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Dashes:"), 0, 5, 1, 1);
-      dash_entry = gtk_entry_new ();
-      gtk_grid_attach (GTK_GRID (grid), dash_entry, 1, 5, 1, 1);
-
-      stroke_toggle = gtk_check_button_new_with_label ("Show outline");
-      gtk_grid_attach (GTK_GRID (grid), stroke_toggle, 1, 6, 1, 1);
-
-      titlebar = gtk_header_bar_new ();
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), edit_toggle);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), reset_button);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), stroke_button);
-
-      gtk_window_set_titlebar (GTK_WINDOW (window), titlebar);
-
-      demo = curve_editor_new ();
-
-      g_signal_connect (stroke_toggle, "toggled", G_CALLBACK (stroke_toggled), demo);
-      g_signal_connect (edit_toggle, "notify::active", G_CALLBACK (edit_changed), demo);
-      g_signal_connect (reset_button, "clicked", G_CALLBACK (reset), demo);
-      g_signal_connect (cap_combo, "notify::selected", G_CALLBACK (cap_changed), demo);
-      g_signal_connect (join_combo, "notify::selected", G_CALLBACK (join_changed), demo);
-      g_signal_connect (color_button, "notify::rgba", G_CALLBACK (color_changed), demo);
-      g_signal_connect (line_width_spin, "value-changed", G_CALLBACK (line_width_changed), demo);
-      g_signal_connect (limit_spin, "value-changed", G_CALLBACK (limit_changed), demo);
-      g_signal_connect (dash_entry, "notify::text", G_CALLBACK (dashes_changed), demo);
-
-      reset (NULL, CURVE_EDITOR (demo));
-
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (line_width_spin), 6);
-      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (color_button), &(GdkRGBA) { 1, 0, 0, 1 });
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (cap_combo), GSK_LINE_CAP_ROUND);
-      gtk_editable_set_text (GTK_EDITABLE (dash_entry), "0 8");
-
-      gtk_window_set_child (GTK_WINDOW (window), demo);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -128,7 +128,6 @@
    <file>fishbowl.ui</file>
    <file>gtkfishbowl.c</file>
    <file>gtkfishbowl.h</file>
-    <file>tiger.node</file>
  </gresource>
  <gresource prefix="/frames">
    <file>frames.ui</file>
@@ -251,10 +250,6 @@
  <gresource prefix="/video-player">
    <file>bbb.png</file>
  </gresource>
-  <gresource prefix="/curve">
-    <file>curve-editor.c</file>
-    <file>curve-editor.h</file>
-  </gresource>
  <gresource prefix="/sources">
    <file>application_demo.c</file>
    <file>assistant.c</file>
@@ -272,7 +267,6 @@
    <file>css_pixbufs.c</file>
    <file>css_shadows.c</file>
    <file>cursors.c</file>
-    <file>curve.c</file>
    <file>dialog.c</file>
    <file>drawingarea.c</file>
    <file>dropdown.c</file>
@@ -293,7 +287,6 @@
    <file>gears.c</file>
    <file>gestures.c</file>
    <file>glarea.c</file>
-    <file>glyphs.c</file>
    <file>gltransition.c</file>
    <file>headerbar.c</file>
    <file>hypertext.c</file>
@@ -332,9 +325,6 @@
    <file>paintable_symbolic.c</file>
    <file>panes.c</file>
    <file>password_entry.c</file>
-    <file>path_fill.c</file>
-    <file>path_maze.c</file>
-    <file>path_text.c</file>
    <file>peg_solitaire.c</file>
    <file>pickers.c</file>
    <file>printing.c</file>
@@ -419,9 +409,6 @@
  <gresource prefix="/fontrendering">
    <file>fontrendering.ui</file>
  </gresource>
-  <gresource prefix="/path_text">
-    <file>path_text.ui</file>
-  </gresource>
  <gresource prefix="/org/gtk/Demo4">
    <file>icons/16x16/actions/application-exit.png</file>
    <file>icons/16x16/actions/document-new.png</file>
@@ -11,9 +11,6 @@
 #include "gtkgears.h"
 #include "gskshaderpaintable.h"

-#include "nodewidget.h"
-#include "graphwidget.h"
-
 const char *const css =
 ".blurred-button {"
 "  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
@@ -204,18 +201,6 @@ create_menu_button (void)
  return w;
 }

-static GtkWidget *
-create_tiger (void)
-{
-  return node_widget_new ("/fishbowl/tiger.node");
-}
-
-static GtkWidget *
-create_graph (void)
-{
-  return graph_widget_new ();
-}
-
 static const struct {
  const char *name;
  GtkWidget * (*create_func) (void);
@@ -233,8 +218,6 @@ static const struct {
  { "Switch",     create_switch         },
  { "Menubutton", create_menu_button    },
  { "Shader",     create_cogs           },
-  { "Tiger",      create_tiger          },
-  { "Graph",      create_graph          },
 };

 static int selected_widget_type = -1;
@@ -12,6 +12,7 @@
 */

 #include <gtk/gtk.h>
+#include <pango/pangofc-font.h>
 #include <hb.h>
 #include <hb-ot.h>
 #include <glib/gi18n.h>
@@ -1,164 +0,0 @@
-#include "graphwidget.h"
-
-struct _GraphWidget
-{
-  GtkWidget parent_instance;
-
-  GskPath *path;
-  GskStroke *stroke;
-  GdkRGBA color;
-  GskPath *stroke_path;
-
-  guint tick_cb;
-  guint64 start_time;
-
-  double period;
-  double amplitude;
-};
-
-struct _GraphWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GraphWidget, graph_widget, GTK_TYPE_WIDGET)
-
-static void
-update_path (GraphWidget *self,
-             float        amplitude)
-{
-  graphene_point_t p[20];
-  GskPathBuilder *builder;
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  g_clear_pointer (&self->stroke_path, gsk_path_unref);
-
-  for (int i = 0; i < 20; i++)
-    {
-      p[i].x = 10 * i;
-      p[i].y = 50;
-
-      if (i % 4 == 1 || i % 4 == 2)
-        {
-          if (i % 8 < 4)
-            p[i].y += amplitude;
-          else
-            p[i].y -= amplitude;
-        }
-    }
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_move_to (builder, p[0].x, p[0].y);
-
-  for (int i = 0; i < 20; i += 4)
-    gsk_path_builder_curve_to (builder,
-                               p[i+1].x, p[i+1].y,
-                               p[i+2].x, p[i+2].y,
-                               p[i+3].x, p[i+3].y);
-
-  self->path = gsk_path_builder_free_to_path (builder);
-  self->stroke_path = gsk_path_stroke (self->path, self->stroke);
-}
-
-static gboolean
-tick_cb (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       user_data)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-  guint64 now;
-  double angle;
-
-  now = gdk_frame_clock_get_frame_time (frame_clock);
-
-  if (self->start_time == 0)
-    self->start_time = now;
-
-  angle = 360 * (now - self->start_time) / (double)(self->period * G_TIME_SPAN_MINUTE);
-  update_path (self, sin (angle) * self->amplitude);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-graph_widget_init (GraphWidget *self)
-{
-  self->color.red = g_random_double_range (0, 1);
-  self->color.green = g_random_double_range (0, 1);
-  self->color.blue = g_random_double_range (0, 1);
-  self->color.alpha = 1;
-
-  self->period = g_random_double_range (0.5, 1);
-  self->amplitude = g_random_double_range (10, 25);
-
-  self->stroke = gsk_stroke_new (2);
-
-  update_path (self, 0);
-
-  self->start_time = 0;
-  self->tick_cb = gtk_widget_add_tick_callback (GTK_WIDGET (self), tick_cb, NULL, NULL);
-}
-
-static void
-graph_widget_dispose (GObject *object)
-{
-  GraphWidget *self = GRAPH_WIDGET (object);
-
-  gsk_path_unref (self->path);
-  gsk_stroke_free (self->stroke);
-
-  G_OBJECT_CLASS (graph_widget_parent_class)->dispose (object);
-}
-
-static void
-graph_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_fill (snapshot, self->stroke_path, GSK_FILL_RULE_WINDING);
-  gtk_snapshot_append_color (snapshot,
-                             &self->color,
-                             &GRAPHENE_RECT_INIT (0, 0, width, height));
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-graph_widget_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum,
-                      int            *natural,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = 200;
-  else
-    *minimum = *natural = 100;
-}
-
-
-static void
-graph_widget_class_init (GraphWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = graph_widget_dispose;
-
-  widget_class->snapshot = graph_widget_snapshot;
-  widget_class->measure = graph_widget_measure;
-}
-
-GtkWidget *
-graph_widget_new (void)
-{
-  return g_object_new (GRAPH_TYPE_WIDGET, NULL);
-}
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define GRAPH_TYPE_WIDGET (graph_widget_get_type ())
-G_DECLARE_FINAL_TYPE (GraphWidget, graph_widget, GRAPH, WIDGET, GtkWidget)
-
-GtkWidget * graph_widget_new       (void);
@@ -18,81 +18,15 @@

 #include "language-names.h"

-#ifdef G_OS_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
-
 #ifndef ISO_CODES_PREFIX
 #define ISO_CODES_PREFIX "/usr"
 #endif

 #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
 #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-#endif

 static GHashTable *language_map;

-#ifdef G_OS_WIN32
-/* if we are using native Windows use native Windows API for language names */
-static BOOL CALLBACK
-get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
-{
-  wchar_t *langname_w = NULL;
-  wchar_t locale_abbrev_w[9];
-  gchar *langname, *locale_abbrev, *locale, *p;
-  gint i;
-  const LCTYPE iso639_lctypes[] = { LOCALE_SISO639LANGNAME, LOCALE_SISO639LANGNAME2 };
-  GHashTable *ht_scripts_langs = (GHashTable *) param;
-  PangoLanguage *lang;
-
-  gint langname_size, locale_abbrev_size;
-  langname_size = GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, 0);
-  if (langname_size == 0)
-    return FALSE;
-
-  langname_w = g_new0 (wchar_t, langname_size);
-
-  if (langname_size == 0)
-    return FALSE;
-
-  GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, langname_size);
-  langname = g_utf16_to_utf8 (langname_w, -1, NULL, NULL, NULL);
-  locale = g_utf16_to_utf8 (locale_w, -1, NULL, NULL, NULL);
-  p = strchr (locale, '-');
-  lang = pango_language_from_string (locale);
-  if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
-    g_hash_table_insert (ht_scripts_langs, lang, langname);
-
-  /*
-   * Track 3+-letter ISO639-2/3 language codes as well (these have a max length of 9 including terminating NUL)
-   * ISO639-2: iso639_lctypes[0] = LOCALE_SISO639LANGNAME
-   * ISO639-3: iso639_lctypes[1] = LOCALE_SISO639LANGNAME2
-   */
-  for (i = 0; i < 2; i++)
-    {
-      locale_abbrev_size = GetLocaleInfoEx (locale_w, iso639_lctypes[i], locale_abbrev_w, 0);
-      if (locale_abbrev_size > 0)
-        {
-          GetLocaleInfoEx (locale_w, iso639_lctypes[i], locale_abbrev_w, locale_abbrev_size);
-
-          locale_abbrev = g_utf16_to_utf8 (locale_abbrev_w, -1, NULL, NULL, NULL);
-          lang = pango_language_from_string (locale_abbrev);
-          if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
-            g_hash_table_insert (ht_scripts_langs, lang, langname);
-
-          g_free (locale_abbrev);
-        }
-    }
-
-  g_free (locale);
-  g_free (langname_w);
-
-  return TRUE;
-}
-
-#else /* non-Windows */
-
 static char *
 get_first_item_in_semicolon_list (const char *list)
 {
@@ -276,7 +210,6 @@ languages_variant_init (const char *variant)
  g_free (filename);
  g_free (buf);
 }
-#endif

 static void
 languages_init (void)
@@ -285,13 +218,8 @@ languages_init (void)
    return;

  language_map = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-
-#ifdef G_OS_WIN32
-  g_return_if_fail (EnumSystemLocalesEx (&get_win32_all_locales_scripts, LOCALE_ALL, (LPARAM) language_map, NULL));
-#else
  languages_variant_init ("iso_639");
  languages_variant_init ("iso_639_3");
-#endif
 }

 const char *
@@ -512,7 +512,7 @@ load_file (const char *demoname,

  info_buffer = gtk_text_buffer_new (NULL);
  gtk_text_buffer_create_tag (info_buffer, "title",
-                              "size", 18 * 1024,
+                              "font", "Sans 18",
                              "pixels-below-lines", 10,
                              NULL);

@@ -1040,7 +1040,7 @@ out:
      g_signal_connect_swapped (G_OBJECT (demo), "destroy", G_CALLBACK (g_application_quit), app);
    }
  else
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_show (GTK_WIDGET (window));

  if (autoquit)
    g_timeout_add_seconds (1, auto_quit, app);
@@ -21,7 +21,7 @@
        <item>
          <attribute name="label" translatable="yes">Save _As...</attribute>
          <attribute name="action">app.save-as</attribute>
-          <attribute name="accel">&lt;Control&gt;&lt;Shift&gt;s</attribute>
+          <attribute name="accel">&lt;Control&gt;s</attribute>
        </item>
      </section>
      <section>
@@ -17,7 +17,6 @@ demos = files([
  'css_pixbufs.c',
  'css_shadows.c',
  'cursors.c',
-  'curve.c',
  'dialog.c',
  'drawingarea.c',
  'dnd.c',
@@ -35,7 +34,6 @@ demos = files([
  'gestures.c',
  'glarea.c',
  'gltransition.c',
-  'glyphs.c',
  'headerbar.c',
  'hypertext.c',
  'iconscroll.c',
@@ -72,9 +70,6 @@ demos = files([
  'paintable_symbolic.c',
  'panes.c',
  'password_entry.c',
-  'path_fill.c',
-  'path_maze.c',
-  'path_text.c',
  'peg_solitaire.c',
  'pickers.c',
  'printing.c',
@@ -103,7 +98,6 @@ demos = files([
  'transparent.c',
  'tree_store.c',
  'video_player.c',
-  'font_features.c',
 ])

 gtkdemo_deps = [ libgtk_dep, ]
@@ -134,12 +128,14 @@ extra_demo_sources = files([
  'script-names.c',
  'unicode-names.c',
  'suggestionentry.c',
-  'language-names.c',
-  'curve-editor.c',
-  'nodewidget.c',
-  'graphwidget.c',
 ])

+if harfbuzz_dep.found() and pangoft_dep.found()
+  demos += files(['font_features.c'])
+  extra_demo_sources += files(['language-names.c'])
+  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
+endif
+
 if os_unix
  demos += files('pagesetup.c')
 endif
@@ -168,7 +164,7 @@ endif

 ld = find_program('ld', required : false)

-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
  glib_compile_resources = find_program('glib-compile-resources')

  # Create the resource blob
@@ -178,7 +174,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
      depfile : 'gtkdemo.gresource.d',
      command : [glib_compile_resources,
                 '--generate',
-                 '--internal',
                 '--target=@OUTPUT@',
                 '--dependency-file=@DEPFILE@',
                 '--sourcedir=' + meson.current_source_dir(),
@@ -192,7 +187,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
      depfile : 'gtkdemo_resources.c.d',
      command : [glib_compile_resources,
                 '--generate-source',
-                 '--internal',
                 '--target=@OUTPUT@',
                 '--dependency-file=@DEPFILE@',
                 '--sourcedir=' + meson.current_source_dir(),
@@ -206,7 +200,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
      input : gtkdemo_gresource,
      output : 'gtkdemo_resources.o',
      command : [ld,
-                 '-z', 'noexecstack',
                 '-r',
                 '-b','binary',
                 '@INPUT@',
@@ -217,7 +210,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
    input : gtkdemo_resources_binary,
    output : 'gtkdemo_resources2.o',
    command : [objcopy,
-                 '--strip-all',
                 '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
                 '@INPUT@',
                 '@OUTPUT@'])
@@ -250,7 +242,7 @@ executable('gtk4-demo',
  c_args: gtkdemo_args + demo_cflags,
  dependencies: gtkdemo_deps,
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -260,7 +252,7 @@ executable('gtk4-demo-application',
  c_args: gtkdemo_args + common_cflags,
  dependencies: gtkdemo_deps,
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -1,76 +0,0 @@
-#include "nodewidget.h"
-
-struct _NodeWidget
-{
-  GtkWidget parent_instance;
-
-  GskRenderNode *node;
-};
-
-struct _NodeWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (NodeWidget, node_widget, GTK_TYPE_WIDGET)
-
-static void
-node_widget_init (NodeWidget *self)
-{
-}
-
-static void
-node_widget_dispose (GObject *object)
-{
-  NodeWidget *self = NODE_WIDGET (object);
-
-  gsk_render_node_unref (self->node);
-
-  G_OBJECT_CLASS (node_widget_parent_class)->dispose (object);
-}
-
-static void
-node_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  NodeWidget *self = NODE_WIDGET (widget);
-
-  gtk_snapshot_append_node (snapshot, self->node);
-}
-
-static void
-node_widget_class_init (NodeWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = node_widget_dispose;
-
-  widget_class->snapshot = node_widget_snapshot;
-}
-
-GtkWidget *
-node_widget_new (const char *resource)
-{
-  NodeWidget *self;
-  GBytes *bytes;
-  GskRenderNode *node;
-  graphene_rect_t bounds;
-  float scale;
-  GskTransform *transform;
-
-  self = g_object_new (NODE_TYPE_WIDGET, NULL);
-
-  bytes = g_resources_lookup_data (resource, 0, NULL);
-  node = gsk_render_node_deserialize (bytes, NULL, NULL);
-  g_bytes_unref (bytes);
-
-  gsk_render_node_get_bounds (node, &bounds);
-  scale = MIN (100.0/bounds.size.width, 100.0/bounds.size.height);
-  transform = gsk_transform_scale (NULL, scale, scale);
-  self->node = gsk_transform_node_new (node, transform);
-  gsk_transform_unref (transform);
-  gsk_render_node_unref (node);
-
-  return GTK_WIDGET (self);
-}
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define NODE_TYPE_WIDGET (node_widget_get_type ())
-G_DECLARE_FINAL_TYPE (NodeWidget, node_widget, NODE, WIDGET, GtkWidget)
-
-GtkWidget * node_widget_new       (const char *file);
@@ -1,348 +0,0 @@
-/* Path/Text Fill
- *
- * This demo shows how to use PangoCairo to draw text with more than
- * just a single color.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "paintable.h"
-#include "gsk/gskpathdashprivate.h"
-
-#define GTK_TYPE_PATH_PAINTABLE (gtk_path_paintable_get_type ())
-G_DECLARE_FINAL_TYPE (GtkPathPaintable, gtk_path_paintable, GTK, PATH_PAINTABLE, GObject)
-
-struct _GtkPathPaintable
-{
-  GObject parent_instance;
-
-  int width;
-  int height;
-  GskPath *path;
-  GdkPaintable *background;
-};
-
-struct _GtkPathPaintableClass
-{
-  GObjectClass parent_class;
-};
-
-static int
-gtk_path_paintable_get_intrinsic_width (GdkPaintable *paintable)
-{
-  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
-
-  if (self->background)
-    return MAX (gdk_paintable_get_intrinsic_width (self->background), self->width);
-  else
-    return self->width;
-}
-
-static int
-gtk_path_paintable_get_intrinsic_height (GdkPaintable *paintable)
-{
-  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
-
-  if (self->background)
-    return MAX (gdk_paintable_get_intrinsic_height (self->background), self->height);
-  else
-    return self->height;
-}
-
-static void
-gtk_path_paintable_snapshot (GdkPaintable *paintable,
-                             GdkSnapshot  *snapshot,
-                             double        width,
-                             double        height)
-{
-  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
-
-#if 0
-  gtk_snapshot_push_fill (snapshot, self->path, GSK_FILL_RULE_WINDING);
-#else
-  GskStroke *stroke = gsk_stroke_new (2.0);
-  gtk_snapshot_push_stroke (snapshot, self->path, stroke);
-  gsk_stroke_free (stroke);
-#endif
-
-  if (self->background)
-    {
-      gdk_paintable_snapshot (self->background, snapshot, width, height);
-    }
-  else
-    {
-      gtk_snapshot_append_linear_gradient (snapshot,
-                                           &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                           &GRAPHENE_POINT_INIT (0, 0),
-                                           &GRAPHENE_POINT_INIT (width, height),
-                                           (GskColorStop[8]) {
-                                             { 0.0, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.2, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.3, { 1.0, 1.0, 0.0, 1.0 } },
-                                             { 0.4, { 0.0, 1.0, 0.0, 1.0 } },
-                                             { 0.6, { 0.0, 1.0, 1.0, 1.0 } },
-                                             { 0.7, { 0.0, 0.0, 1.0, 1.0 } },
-                                             { 0.8, { 1.0, 0.0, 1.0, 1.0 } },
-                                             { 1.0, { 1.0, 0.0, 1.0, 1.0 } }
-                                           },
-                                           8);
-    }
-
-  gtk_snapshot_pop (snapshot);
-
-}
-
-static GdkPaintableFlags
-gtk_path_paintable_get_flags (GdkPaintable *paintable)
-{
-  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
-
-  if (self->background)
-    return gdk_paintable_get_flags (self->background);
-  else
-    return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-gtk_path_paintable_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->get_intrinsic_width = gtk_path_paintable_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_path_paintable_get_intrinsic_height;
-  iface->snapshot = gtk_path_paintable_snapshot;
-  iface->get_flags = gtk_path_paintable_get_flags;
-}
-
-/* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkPathPaintable, gtk_path_paintable, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_path_paintable_paintable_init))
-
-/* Here's the boilerplate for the GObject declaration.
- * We don't need to do anything special here, because we keep no
- * data of our own.
- */
-static void
-gtk_path_paintable_class_init (GtkPathPaintableClass *klass)
-{
-}
-
-static void
-gtk_path_paintable_init (GtkPathPaintable *self)
-{
-}
-
-/* And finally, we add a simple constructor.
- * It is declared in the header so that the other examples
- * can use it.
- */
-GdkPaintable *
-gtk_path_paintable_new (GskPath      *path,
-                        GdkPaintable *background,
-                        int           width,
-                        int           height)
-{
-  GtkPathPaintable *self;
-
-  self = g_object_new (GTK_TYPE_PATH_PAINTABLE, NULL);
-  self->path = path;
-  self->background = background;
-  if (self->background)
-    {
-      g_signal_connect_swapped (self->background, "invalidate-contents", G_CALLBACK (gdk_paintable_invalidate_contents), self);
-      g_signal_connect_swapped (self->background, "invalidate-size", G_CALLBACK (gdk_paintable_invalidate_size), self);
-    }
-  self->width = width;
-  self->height = height;
-
-  return GDK_PAINTABLE (self);
-}
-
-void
-gtk_path_paintable_set_path (GtkPathPaintable *self,
-                             GskPath          *path)
-{
-  g_clear_pointer (&self->path, gsk_path_unref);
-  self->path = gsk_path_ref (path);
-
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-}
-
-static GskPath *
-create_hexagon (GtkWidget *widget)
-{
-  GskPathBuilder *builder;
-
-  builder = gsk_path_builder_new ();
-
-  gsk_path_builder_move_to (builder, 120, 0);
-  gsk_path_builder_line_to (builder, 360, 0);
-  gsk_path_builder_line_to (builder, 480, 208);
-  gsk_path_builder_line_to (builder, 360, 416);
-  gsk_path_builder_line_to (builder, 120, 416);
-  gsk_path_builder_line_to (builder, 0, 208);
-  gsk_path_builder_close (builder);
-
-  return gsk_path_builder_free_to_path (builder);
-}
-
-static GskPath *
-create_path_from_text (GtkWidget *widget)
-{
-  PangoLayout *layout;
-  PangoFontDescription *desc;
-  GskPathBuilder *builder;
-
-  layout = gtk_widget_create_pango_layout (widget, "Pango power!\nPango power!\nPango power!");
-  desc = pango_font_description_from_string ("sans bold 36");
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-
-  builder = gsk_path_builder_new ();
-
-  gsk_path_builder_add_layout (builder, layout);
-
-  return gsk_path_builder_free_to_path (builder);
-}
-
-static gboolean
-build_path (GskPathOperation        op,
-            const graphene_point_t *pts,
-            gsize                   n_pts,
-            float                   weight,
-            gpointer                user_data)
-{
-  GskPathBuilder *builder = user_data;
-
-  switch (op)
-  {
-    case GSK_PATH_MOVE:
-      gsk_path_builder_move_to (builder, pts[0].x, pts[0].y);
-      break;
-
-    case GSK_PATH_CLOSE:
-      gsk_path_builder_close (builder);
-      break;
-
-    case GSK_PATH_LINE:
-      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
-      break;
-
-    case GSK_PATH_CURVE:
-      gsk_path_builder_curve_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
-      break;
-
-    case GSK_PATH_CONIC:
-      gsk_path_builder_conic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, weight);
-      break;
-
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return TRUE;
-}
-
-
-static gboolean
-update_path (GtkWidget     *widget,
-             GdkFrameClock *frame_clock,
-             gpointer       measure)
-{
-  float progress = gdk_frame_clock_get_frame_time (frame_clock) % (60 * G_USEC_PER_SEC) / (float) (30 * G_USEC_PER_SEC);
-  GskPathBuilder *builder;
-  GskPath *path;
-  graphene_point_t pos;
-  graphene_vec2_t tangent;
-  GskStroke *stroke;
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_add_segment (builder,
-                                measure,
-#if 1
-                                0.0, gsk_path_measure_get_length (measure));
-#else
-                                progress > 1 ? (progress - 1) * gsk_path_measure_get_length (measure) : 0.0,
-                                (progress < 1 ? progress : 1.0) * gsk_path_measure_get_length (measure));
-#endif
-
-  path = gsk_path_builder_free_to_path (builder);
-
-  stroke = gsk_stroke_new (1);
-  gsk_stroke_set_dash (stroke, (float[2]) { 10, 5 }, 2);
-  gsk_stroke_set_dash_offset (stroke, - (gdk_frame_clock_get_frame_time (frame_clock) % G_USEC_PER_SEC) * 15. / G_USEC_PER_SEC);
-  builder = gsk_path_builder_new ();
-  gsk_path_dash (path, stroke, 0.2, build_path, builder);
-  gsk_path_unref (path);
-
-  gsk_path_measure_get_point (measure,
-                              (progress > 1 ? (progress - 1) : progress) * gsk_path_measure_get_length (measure),
-                              &pos,
-                              &tangent);
-  gsk_path_builder_move_to (builder, pos.x + 5 * graphene_vec2_get_x (&tangent), pos.y + 5 * graphene_vec2_get_y (&tangent));
-  gsk_path_builder_line_to (builder, pos.x + 3 * graphene_vec2_get_y (&tangent), pos.y + 3 * graphene_vec2_get_x (&tangent));
-  gsk_path_builder_line_to (builder, pos.x - 3 * graphene_vec2_get_y (&tangent), pos.y - 3 * graphene_vec2_get_x (&tangent));
-  gsk_path_builder_close (builder);
-
-  path = gsk_path_builder_free_to_path (builder);
-
-  gtk_path_paintable_set_path (GTK_PATH_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget))),
-                               path);
-  gsk_path_unref (path);
-
-  return G_SOURCE_CONTINUE;
-}
-
-GtkWidget *
-do_path_fill (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *picture;
-      GdkPaintable *paintable;
-      GtkMediaStream *stream;
-      GskPath *path;
-      graphene_rect_t bounds;
-      GskPathMeasure *measure;
-
-      window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_title (GTK_WINDOW (window), "Path Fill");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-#if 0
-      stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-#else
-      stream = gtk_nuclear_media_stream_new ();
-#endif
-      gtk_media_stream_play (stream);
-      gtk_media_stream_set_loop (stream, TRUE);
-
-      path = create_hexagon (window);
-      path = create_path_from_text (window);
-      gsk_path_get_bounds (path, &bounds);
-
-      paintable = gtk_path_paintable_new (path,
-                                          GDK_PAINTABLE (stream),
-                                          bounds.origin.x + bounds.size.width,
-                                          bounds.origin.y + bounds.size.height);
-      picture = gtk_picture_new_for_paintable (paintable);
-      measure = gsk_path_measure_new (path);
-      gtk_widget_add_tick_callback (picture, update_path, measure, (GDestroyNotify) gsk_path_measure_unref);
-      gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE);
-      gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
-      g_object_unref (paintable);
-
-      gtk_window_set_child (GTK_WINDOW (window), picture);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,339 +0,0 @@
-/* Path/Maze
- * #Keywords: game, mouse
- *
- * This demo shows how to use a GskPath to create a maze and use
- * gsk_path_measure_get_closest_point() to check the mouse stays
- * on the path.
- *
- * It also shows off the performance of GskPath (or not) as this
- * is a rather complex path.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "paintable.h"
-
-#define MAZE_GRID_SIZE 20
-#define MAZE_STROKE_SIZE_ACTIVE (MAZE_GRID_SIZE - 4)
-#define MAZE_STROKE_SIZE_INACTIVE (MAZE_GRID_SIZE - 12)
-#define MAZE_WIDTH 31
-#define MAZE_HEIGHT 21
-
-#define GTK_TYPE_MAZE (gtk_maze_get_type ())
-G_DECLARE_FINAL_TYPE (GtkMaze, gtk_maze, GTK, MAZE, GtkWidget)
-
-struct _GtkMaze
-{
-  GtkWidget parent_instance;
-
-  int width;
-  int height;
-  GskPath *path;
-  GskPathMeasure *measure;
-  GdkPaintable *background;
-
-  gboolean active;
-};
-
-struct _GtkMazeClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GtkMaze, gtk_maze, GTK_TYPE_WIDGET)
-
-static void
-gtk_maze_measure (GtkWidget      *widget,
-                  GtkOrientation  orientation,
-                  int             for_size,
-                  int            *minimum,
-                  int            *natural,
-                  int            *minimum_baseline,
-                  int            *natural_baseline)
-{
-  GtkMaze *self = GTK_MAZE (widget);
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = self->width;
-  else
-    *minimum = *natural = self->height;
-}
-
-static void
-gtk_maze_snapshot (GtkWidget   *widget,
-                   GdkSnapshot *snapshot)
-{
-  GtkMaze *self = GTK_MAZE (widget);
-  double width = gtk_widget_get_width (widget);
-  double height = gtk_widget_get_height (widget);
-  GskStroke *stroke;
-
-  stroke = gsk_stroke_new (MAZE_STROKE_SIZE_INACTIVE);
-  if (self->active)
-    gsk_stroke_set_line_width (stroke, MAZE_STROKE_SIZE_ACTIVE);
-  gsk_stroke_set_line_join (stroke, GSK_LINE_JOIN_ROUND);
-  gsk_stroke_set_line_cap (stroke, GSK_LINE_CAP_ROUND);
-  gtk_snapshot_push_stroke (snapshot, self->path, stroke);
-  gsk_stroke_free (stroke);
-
-  if (self->background)
-    {
-      gdk_paintable_snapshot (self->background, snapshot, width, height);
-    }
-  else
-    {
-      gtk_snapshot_append_linear_gradient (snapshot,
-                                           &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                           &GRAPHENE_POINT_INIT (0, 0),
-                                           &GRAPHENE_POINT_INIT (width, height),
-                                           (GskColorStop[8]) {
-                                             { 0.0, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.2, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.3, { 1.0, 1.0, 0.0, 1.0 } },
-                                             { 0.4, { 0.0, 1.0, 0.0, 1.0 } },
-                                             { 0.6, { 0.0, 1.0, 1.0, 1.0 } },
-                                             { 0.7, { 0.0, 0.0, 1.0, 1.0 } },
-                                             { 0.8, { 1.0, 0.0, 1.0, 1.0 } },
-                                             { 1.0, { 1.0, 0.0, 1.0, 1.0 } }
-                                           },
-                                           8);
-    }
-
-  gtk_snapshot_pop (snapshot);
-
-}
-
-static void
-gtk_maze_dispose (GObject *object)
-{
-  GtkMaze *self = GTK_MAZE (object);
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  g_clear_pointer (&self->measure, gsk_path_measure_unref);
-  if (self->background)
-    {
-      g_signal_handlers_disconnect_matched (self->background, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
-      g_clear_object (&self->background);
-    }
-
-  G_OBJECT_CLASS (gtk_maze_parent_class)->dispose (object);
-}
-
-static void
-gtk_maze_class_init (GtkMazeClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gtk_maze_dispose;
-
-  widget_class->measure = gtk_maze_measure;
-  widget_class->snapshot = gtk_maze_snapshot;
-}
-
-static void
-pointer_motion (GtkEventControllerMotion *controller,
-                double                    x,
-                double                    y,
-                GtkMaze                  *self)
-{
-  if (!self->active)
-    return;
-
-  if (gsk_path_measure_get_closest_point (self->measure, &GRAPHENE_POINT_INIT (x, y), NULL) <= MAZE_STROKE_SIZE_ACTIVE / 2.0f)
-    return;
-
-  self->active = FALSE;
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-pointer_leave (GtkEventControllerMotion *controller,
-               GtkMaze                  *self)
-{
-  if (!self->active)
-    {
-      self->active = TRUE;
-      gtk_widget_queue_draw (GTK_WIDGET (self));
-    }
-}
-
-static void
-gtk_maze_init (GtkMaze *self)
-{
-  GtkEventController *controller;
-
-  controller = GTK_EVENT_CONTROLLER (gtk_event_controller_motion_new ());
-  g_signal_connect (controller, "motion", G_CALLBACK (pointer_motion), self);
-  g_signal_connect (controller, "leave", G_CALLBACK (pointer_leave), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-
-  self->active = TRUE;
-}
-
-static void
-gtk_maze_set_path (GtkMaze *self,
-                   GskPath *path)
-{
-  g_clear_pointer (&self->path, gsk_path_unref);
-  g_clear_pointer (&self->measure, gsk_path_measure_unref);
-  self->path = gsk_path_ref (path);
-  self->measure = gsk_path_measure_new (path);
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-GtkWidget *
-gtk_maze_new (GskPath      *path,
-              GdkPaintable *background,
-              int           width,
-              int           height)
-{
-  GtkMaze *self;
-
-  self = g_object_new (GTK_TYPE_MAZE, NULL);
-
-  gtk_maze_set_path (self, path);
-  gsk_path_unref (path);
-  self->background = background;
-  if (self->background)
-    {
-      g_signal_connect_swapped (self->background, "invalidate-contents", G_CALLBACK (gtk_widget_queue_draw), self);
-      g_signal_connect_swapped (self->background, "invalidate-size", G_CALLBACK (gtk_widget_queue_resize), self);
-    }
-  self->width = width;
-  self->height = height;
-
-  return GTK_WIDGET (self);
-}
-
-static void
-add_point_to_maze (GtkBitset      *maze,
-                   GskPathBuilder *builder,
-                   guint           x,
-                   guint           y)
-{
-  gboolean set[4] = { };
-  guint dir;
-
-  gtk_bitset_add (maze, y * MAZE_WIDTH + x);
-
-  while (TRUE)
-    {
-      set[0] = set[0] || x == 0 || gtk_bitset_contains (maze, y * MAZE_WIDTH + x - 1);
-      set[1] = set[1] || y == 0 || gtk_bitset_contains (maze, (y - 1) * MAZE_WIDTH + x);
-      set[2] = set[2] || x + 1 == MAZE_WIDTH || gtk_bitset_contains (maze, y * MAZE_WIDTH + x + 1);
-      set[3] = set[3] || y + 1 == MAZE_HEIGHT || gtk_bitset_contains (maze, (y + 1) * MAZE_WIDTH + x);
-
-      if (set[0] && set[1] && set[2] && set[3])
-        return;
-
-      do
-        {
-          dir = g_random_int_range (0, 4);
-        }
-      while (set[dir]);
-
-      switch (dir)
-        {
-          case 0:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x - 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x - 1, y);
-            break;
-
-          case 1:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y - 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x, y - 1);
-            break;
-
-          case 2:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 1.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x + 1, y);
-            break;
-
-          case 3:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 1.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x, y + 1);
-            break;
-
-          default:
-            g_assert_not_reached ();
-            break;
-        }
-    }
-}
-
-static GskPath *
-create_path_for_maze (GtkWidget *widget)
-{
-  GskPathBuilder *builder;
-  GtkBitset *maze;
-
-  builder = gsk_path_builder_new ();
-  maze = gtk_bitset_new_empty ();
-  /* make sure the outer lines are unreachable:
-   * Set the full range, then remove the center again. */
-  gtk_bitset_add_range (maze, 0, MAZE_WIDTH * MAZE_HEIGHT);
-  gtk_bitset_remove_rectangle (maze, MAZE_WIDTH + 1, MAZE_WIDTH - 2, MAZE_HEIGHT - 2, MAZE_WIDTH);
-
-  /* Fill the maze */
-  add_point_to_maze (maze, builder, MAZE_WIDTH / 2, MAZE_HEIGHT / 2);
-
-  /* Add start and stop lines */
-  gsk_path_builder_move_to (builder, 1.5 * MAZE_GRID_SIZE, -0.5 * MAZE_GRID_SIZE);
-  gsk_path_builder_line_to (builder, 1.5 * MAZE_GRID_SIZE, 1.5 * MAZE_GRID_SIZE);
-  gsk_path_builder_move_to (builder, (MAZE_WIDTH - 1.5) * MAZE_GRID_SIZE, (MAZE_HEIGHT - 1.5) * MAZE_GRID_SIZE);
-  gsk_path_builder_line_to (builder, (MAZE_WIDTH - 1.5) * MAZE_GRID_SIZE, (MAZE_HEIGHT + 0.5) * MAZE_GRID_SIZE);
-
-
-  gtk_bitset_unref (maze);
-
-  return gsk_path_builder_free_to_path (builder);
-}
-
-GtkWidget *
-do_path_maze (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *maze;
-      GtkMediaStream *stream;
-      GskPath *path;
-
-      window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_title (GTK_WINDOW (window), "Follow the maze with the mouse");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-#if 0
-      stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-#else
-      stream = gtk_nuclear_media_stream_new ();
-#endif
-      gtk_media_stream_play (stream);
-      gtk_media_stream_set_loop (stream, TRUE);
-
-      path = create_path_for_maze (window);
-
-      maze = gtk_maze_new (path,
-                           GDK_PAINTABLE (stream),
-                           MAZE_WIDTH * MAZE_GRID_SIZE,
-                           MAZE_HEIGHT * MAZE_GRID_SIZE);
-
-      gtk_window_set_child (GTK_WINDOW (window), maze);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,594 +0,0 @@
-/* Path/Curved Text
- *
- * This demo shows how to use GskPath to animate a path along another path.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_PATH_WIDGET (gtk_path_widget_get_type ())
-G_DECLARE_FINAL_TYPE (GtkPathWidget, gtk_path_widget, GTK, PATH_WIDGET, GtkWidget)
-
-#define POINT_SIZE 8
-
-enum {
-  PROP_0,
-  PROP_TEXT,
-  PROP_EDITABLE,
-  N_PROPS
-};
-
-struct _GtkPathWidget
-{
-  GtkWidget parent_instance;
-
-  char *text;
-  gboolean editable;
-
-  graphene_point_t points[4];
-
-  guint active_point;
-  float line_closest;
-
-  GskPath *line_path;
-  GskPathMeasure *line_measure;
-  GskPath *text_path;
-
-  GdkPaintable *background;
-};
-
-struct _GtkPathWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-G_DEFINE_TYPE (GtkPathWidget, gtk_path_widget, GTK_TYPE_WIDGET)
-
-static GskPath *
-create_path_from_text (GtkWidget  *widget,
-                       const char *text)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  cairo_path_t *path;
-  PangoLayout *layout;
-  PangoFontDescription *desc;
-  GskPath *result;
-
-  surface = cairo_recording_surface_create (CAIRO_CONTENT_COLOR_ALPHA, NULL);
-  cr = cairo_create (surface);
-
-  layout = gtk_widget_create_pango_layout (widget, text);
-  desc = pango_font_description_from_string ("sans bold 36");
-  pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
-
-  cairo_move_to (cr, 0, - pango_layout_get_baseline (layout) / (double) PANGO_SCALE);
-  pango_cairo_layout_path (cr, layout);
-  path = cairo_copy_path (cr);
-  result = gsk_path_new_from_cairo (path);
-
-  cairo_path_destroy (path);
-  g_object_unref (layout);
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-
-  return result;
-}
-
-typedef struct
-{
-  GskPathMeasure *measure;
-  GskPathBuilder *builder;
-  double scale;
-} GtkPathTransform;
-
-static void
-gtk_path_transform_point (GskPathMeasure         *measure,
-                          const graphene_point_t *pt,
-                          float                   scale,
-                          graphene_point_t       *res)
-{
-  graphene_vec2_t tangent;
-
-  gsk_path_measure_get_point (measure, pt->x * scale, res, &tangent);
-
-  res->x -= pt->y * scale * graphene_vec2_get_y (&tangent);
-  res->y += pt->y * scale * graphene_vec2_get_x (&tangent);
-}
-
-static gboolean
-gtk_path_transform_op (GskPathOperation        op,
-                       const graphene_point_t *pts,
-                       gsize                   n_pts,
-                       float                   weight,
-                       gpointer                data)
-{
-  GtkPathTransform *transform = data;
-
-  switch (op)
-  {
-    case GSK_PATH_MOVE:
-      {
-        graphene_point_t res;
-        gtk_path_transform_point (transform->measure, &pts[0], transform->scale, &res);
-        gsk_path_builder_move_to (transform->builder, res.x, res.y);
-      }
-      break;
-
-    case GSK_PATH_LINE:
-      {
-        graphene_point_t res;
-        gtk_path_transform_point (transform->measure, &pts[1], transform->scale, &res);
-        gsk_path_builder_line_to (transform->builder, res.x, res.y);
-      }
-      break;
-
-    case GSK_PATH_CURVE:
-      {
-        graphene_point_t res[3];
-        gtk_path_transform_point (transform->measure, &pts[1], transform->scale, &res[0]);
-        gtk_path_transform_point (transform->measure, &pts[2], transform->scale, &res[1]);
-        gtk_path_transform_point (transform->measure, &pts[3], transform->scale, &res[2]);
-        gsk_path_builder_curve_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, res[2].x, res[2].y);
-      }
-      break;
-
-    case GSK_PATH_CONIC:
-      {
-        graphene_point_t res[2];
-        gtk_path_transform_point (transform->measure, &pts[1], transform->scale, &res[0]);
-        gtk_path_transform_point (transform->measure, &pts[2], transform->scale, &res[1]);
-        gsk_path_builder_conic_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, weight);
-      }
-      break;
-
-    case GSK_PATH_CLOSE:
-      gsk_path_builder_close (transform->builder);
-      break;
-
-    default:
-      g_assert_not_reached();
-      return FALSE;
-  }
-
-  return TRUE;
-}
-
-static GskPath *
-gtk_path_transform (GskPathMeasure *measure,
-                    GskPath        *path)
-{
-  GtkPathTransform transform = { measure, gsk_path_builder_new () };
-  graphene_rect_t bounds;
-
-  gsk_path_get_bounds (path, &bounds);
-  if (bounds.origin.x + bounds.size.width > 0)
-    transform.scale = gsk_path_measure_get_length (measure) / (bounds.origin.x + bounds.size.width);
-  else
-    transform.scale = 1.0f;
-
-  gsk_path_foreach (path, GSK_PATH_FOREACH_ALLOW_CURVE, gtk_path_transform_op, &transform);
-
-  return gsk_path_builder_free_to_path (transform.builder);
-}
-
-static void
-gtk_path_widget_clear_text_path (GtkPathWidget *self)
-{
-  g_clear_pointer (&self->text_path, gsk_path_unref);
-}
-
-static void
-gtk_path_widget_clear_paths (GtkPathWidget *self)
-{
-  gtk_path_widget_clear_text_path (self);
-
-  g_clear_pointer (&self->line_path, gsk_path_unref);
-  g_clear_pointer (&self->line_measure, gsk_path_measure_unref);
-}
-
-static void
-gtk_path_widget_create_text_path (GtkPathWidget *self)
-{
-  GskPath *path;
-
-  gtk_path_widget_clear_text_path (self);
-
-  if (self->line_measure == NULL)
-    return;
-
-  path = create_path_from_text (GTK_WIDGET (self), self->text);
-  self->text_path = gtk_path_transform (self->line_measure, path);
-
-  gsk_path_unref (path);
-}
-
-static void
-gtk_path_widget_create_paths (GtkPathWidget *self)
-{
-  double width = gtk_widget_get_width (GTK_WIDGET (self));
-  double height = gtk_widget_get_height (GTK_WIDGET (self));
-  GskPathBuilder *builder;
-
-  gtk_path_widget_clear_paths (self);
-
-  if (width <= 0 || height <= 0)
-    return;
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_move_to (builder,
-                            self->points[0].x * width, self->points[0].y * height);
-  gsk_path_builder_curve_to (builder,
-                             self->points[1].x * width, self->points[1].y * height,
-                             self->points[2].x * width, self->points[2].y * height,
-                             self->points[3].x * width, self->points[3].y * height);
-  self->line_path = gsk_path_builder_free_to_path (builder);
-
-  self->line_measure = gsk_path_measure_new (self->line_path);
-
-  gtk_path_widget_create_text_path (self);
-}
-
-static void
-gtk_path_widget_allocate (GtkWidget *widget,
-                          int        width,
-                          int        height,
-                          int        baseline)
-{
-  GtkPathWidget *self = GTK_PATH_WIDGET (widget);
-
-  GTK_WIDGET_CLASS (gtk_path_widget_parent_class)->size_allocate (widget, width, height, baseline);
-
-  gtk_path_widget_create_paths (self);
-}
-
-static void
-gtk_path_widget_snapshot (GtkWidget   *widget,
-                          GtkSnapshot *snapshot)
-{
-  GtkPathWidget *self = GTK_PATH_WIDGET (widget);
-  double width = gtk_widget_get_width (widget);
-  double height = gtk_widget_get_height (widget);
-  GskPath *path;
-  GskStroke *stroke;
-  gsize i;
-
-  /* frosted glass the background */
-  gtk_snapshot_push_blur (snapshot, 100);
-  gdk_paintable_snapshot (self->background, snapshot, width, height);
-  gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 1, 1, 1, 0.5 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-  gtk_snapshot_pop (snapshot);
-
-  /* draw the text */
-  if (self->text_path)
-    {
-      gtk_snapshot_push_fill (snapshot, self->text_path, GSK_FILL_RULE_WINDING);
-      gdk_paintable_snapshot (self->background, snapshot, width, height);
-
-      /* ... with an emboss effect */
-      stroke = gsk_stroke_new (2.0);
-      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT(1, 1));
-      gtk_snapshot_push_stroke (snapshot, self->text_path, stroke);
-      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 0.2 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gsk_stroke_free (stroke);
-      gtk_snapshot_pop (snapshot);
-
-      gtk_snapshot_pop (snapshot);
-    }
-
-  if (self->editable && self->line_path)
-    {
-      /* draw the control line */
-      stroke = gsk_stroke_new (1.0);
-      gtk_snapshot_push_stroke (snapshot, self->line_path, stroke);
-      gsk_stroke_free (stroke);
-      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
-    }
-
-  if (self->line_closest >= 0)
-    {
-      GskPathBuilder *builder;
-      graphene_point_t closest;
-
-      builder = gsk_path_builder_new ();
-      gsk_path_measure_get_point (self->line_measure, self->line_closest, &closest, NULL);
-      gsk_path_builder_add_circle (builder, &closest, POINT_SIZE);
-      path = gsk_path_builder_free_to_path (builder);
-
-      gtk_snapshot_push_fill (snapshot, path, GSK_FILL_RULE_WINDING);
-      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
-
-      gsk_path_unref (path);
-    }
-
-  if (self->editable && self->line_path)
-    {
-      GskPathBuilder *builder;
-
-      /* draw the points */
-      builder = gsk_path_builder_new ();
-      for (i = 0; i < 4; i++)
-        {
-          gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (self->points[i].x * width, self->points[i].y * height), POINT_SIZE);
-        }
-      path = gsk_path_builder_free_to_path (builder);
-
-      gtk_snapshot_push_fill (snapshot, path, GSK_FILL_RULE_WINDING);
-      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 1, 1, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
-
-      stroke = gsk_stroke_new (1.0);
-      gtk_snapshot_push_stroke (snapshot, path, stroke);
-      gsk_stroke_free (stroke);
-      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
-
-      gsk_path_unref (path);
-    }
-}
-
-static void
-gtk_path_widget_set_text (GtkPathWidget *self,
-                          const char    *text)
-{
-  if (g_strcmp0 (self->text, text) == 0)
-    return;
-
-  g_free (self->text);
-  self->text = g_strdup (text);
-
-  gtk_path_widget_create_paths (self);
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TEXT]);
-}
-
-static void
-gtk_path_widget_set_editable (GtkPathWidget *self,
-                              gboolean       editable)
-{
-  if (self->editable == editable)
-    return;
-
-  self->editable = editable;
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_EDITABLE]);
-}
-
-static void
-gtk_path_widget_set_property (GObject      *object,
-                              guint         prop_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
-
-{
-  GtkPathWidget *self = GTK_PATH_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_TEXT:
-      gtk_path_widget_set_text (self, g_value_get_string (value));
-      break;
-
-    case PROP_EDITABLE:
-      gtk_path_widget_set_editable (self, g_value_get_boolean (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_path_widget_get_property (GObject    *object,
-                              guint       prop_id,
-                              GValue     *value,
-                              GParamSpec *pspec)
-{
-  GtkPathWidget *self = GTK_PATH_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_TEXT:
-      g_value_set_string (value, self->text);
-      break;
-
-    case PROP_EDITABLE:
-      g_value_set_boolean (value, self->editable);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_path_widget_dispose (GObject *object)
-{
-  GtkPathWidget *self = GTK_PATH_WIDGET (object);
-
-  gtk_path_widget_clear_paths (self);
-
-  G_OBJECT_CLASS (gtk_path_widget_parent_class)->dispose (object);
-}
-
-static void
-gtk_path_widget_class_init (GtkPathWidgetClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gtk_path_widget_dispose;
-  object_class->set_property = gtk_path_widget_set_property;
-  object_class->get_property = gtk_path_widget_get_property;
-
-  widget_class->size_allocate = gtk_path_widget_allocate;
-  widget_class->snapshot = gtk_path_widget_snapshot;
-
-  properties[PROP_TEXT] =
-    g_param_spec_string ("text",
-                         "text",
-                         "Text transformed along a path",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_EDITABLE] =
-    g_param_spec_boolean ("editable",
-                          "editable",
-                          "If the path can be edited by the user",
-                          FALSE,
-                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, N_PROPS, properties);
-}
-
-static void
-drag_begin (GtkGestureDrag *gesture,
-            double          x,
-            double          y,
-            GtkPathWidget  *self)
-{
-  graphene_point_t mouse = GRAPHENE_POINT_INIT (x, y);
-  double width = gtk_widget_get_width (GTK_WIDGET (self));
-  double height = gtk_widget_get_height (GTK_WIDGET (self));
-  gsize i;
-
-  for (i = 0; i < 4; i++)
-    {
-      if (graphene_point_distance (&GRAPHENE_POINT_INIT (self->points[i].x * width, self->points[i].y * height), &mouse, NULL, NULL) <= POINT_SIZE)
-        {
-          self->active_point = i;
-          break;
-        }
-    }
-  if (i == 4)
-    {
-      gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
-      return;
-    }
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-drag_update (GtkGestureDrag *drag,
-             double          offset_x,
-             double          offset_y,
-             GtkPathWidget  *self)
-{
-  double width = gtk_widget_get_width (GTK_WIDGET (self));
-  double height = gtk_widget_get_height (GTK_WIDGET (self));
-  double start_x, start_y;
-
-  gtk_gesture_drag_get_start_point (drag, &start_x, &start_y);
-
-  self->points[self->active_point] = GRAPHENE_POINT_INIT ((start_x + offset_x) / width,
-                                                          (start_y + offset_y) / height);
-  self->points[self->active_point].x = CLAMP (self->points[self->active_point].x, 0, 1);
-  self->points[self->active_point].y = CLAMP (self->points[self->active_point].y, 0, 1);
-
-  gtk_path_widget_create_paths (self);
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-pointer_motion (GtkEventControllerMotion *controller,
-                double                    x,
-                double                    y,
-                GtkPathWidget            *self)
-{
-  gsk_path_measure_get_closest_point_full (self->line_measure,
-                                           &GRAPHENE_POINT_INIT (x, y),
-                                           INFINITY,
-                                           NULL, NULL,
-                                           &self->line_closest,
-                                           NULL);
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-pointer_leave (GtkEventControllerMotion *controller,
-               GtkPathWidget            *self)
-{
-  self->line_closest = -1;
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-gtk_path_widget_init (GtkPathWidget *self)
-{
-  GtkEventController *controller;
-
-  controller = GTK_EVENT_CONTROLLER (gtk_gesture_drag_new ());
-  g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);
-  g_signal_connect (controller, "drag-update", G_CALLBACK (drag_update), self);
-  g_signal_connect (controller, "drag-end", G_CALLBACK (drag_update), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-
-  controller = GTK_EVENT_CONTROLLER (gtk_event_controller_motion_new ());
-  g_signal_connect (controller, "enter", G_CALLBACK (pointer_motion), self);
-  g_signal_connect (controller, "motion", G_CALLBACK (pointer_motion), self);
-  g_signal_connect (controller, "leave", G_CALLBACK (pointer_leave), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-
-  self->line_closest = -1;
-
-  self->points[0] = GRAPHENE_POINT_INIT (0.1, 0.9);
-  self->points[1] = GRAPHENE_POINT_INIT (0.3, 0.1);
-  self->points[2] = GRAPHENE_POINT_INIT (0.7, 0.1);
-  self->points[3] = GRAPHENE_POINT_INIT (0.9, 0.9);
-
-  self->background = GDK_PAINTABLE (gdk_texture_new_from_resource ("/sliding_puzzle/portland-rose.jpg"));
-
-  gtk_path_widget_set_text (self, "It's almost working");
-}
-
-GtkWidget *
-gtk_path_widget_new (void)
-{
-  GtkPathWidget *self;
-
-  self = g_object_new (GTK_TYPE_PATH_WIDGET, NULL);
-
-  return GTK_WIDGET (self);
-}
-
-GtkWidget *
-do_path_text (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (GTK_TYPE_PATH_WIDGET);
-
-      builder = gtk_builder_new_from_resource ("/path_text/path_text.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Text along a Path</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <child type="end">
-          <object class="GtkToggleButton" id="edit-toggle">
-            <property name="icon-name">document-edit-symbolic</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkRevealer">
-            <property name="reveal-child" bind-source="edit-toggle" bind-property="active" bind-flags="sync-create"></property>
-            <child>
-              <object class="GtkEntry" id="text">
-                <property name="text">Through the looking glass</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkPathWidget" id="view">
-            <property name="editable" bind-source="edit-toggle" bind-property="active" bind-flags="sync-create"></property>
-            <property name="text" bind-source="text" bind-property="text" bind-flags="sync-create"></property>
-            <property name="hexpand">true</property>
-            <property name="vexpand">true</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -16,7 +16,7 @@ executable('gtk4-icon-browser',
  c_args: common_cflags,
  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -3,7 +3,7 @@ demo_profile = get_option('profile')

 demo_conf_h = declare_dependency(
  sources: custom_target('demo-header',
-    command: [gen_demo_header, meson.project_source_root(), demo_profile],
+    command: [gen_demo_header, meson.source_root(), demo_profile],
    capture: true,
    output: 'demo_conf.h',
    build_by_default: true,
@@ -17,7 +17,7 @@ executable('gtk4-node-editor',
  c_args: [
    '-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir())
  ] + common_cflags,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: false,
 )
@@ -3,7 +3,7 @@ executable('gtk4-print-editor',
  c_args: common_cflags,
  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -871,7 +871,7 @@ activate (GApplication *app)

  update_ui ();

-  gtk_window_present (GTK_WINDOW (main_window));
+  gtk_widget_show (main_window);
 }

 static void
@@ -8,7 +8,7 @@ endif

 ld = find_program('ld', required : false)

-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
  glib_compile_resources = find_program('glib-compile-resources')

  # Create the resource blob
@@ -18,7 +18,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
      depfile: 'widgetfactory.gresource.d',
      command : [glib_compile_resources,
                 '--generate',
-                 '--internal',
                 '--target=@OUTPUT@',
                 '--dependency-file=@DEPFILE@',
                 '--sourcedir=' + meson.current_source_dir(),
@@ -32,7 +31,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
      depfile: 'widgetfactory_resources.c.d',
      command : [glib_compile_resources,
                 '--generate-source',
-                 '--internal',
                 '--target=@OUTPUT@',
                 '--dependency-file=@DEPFILE@',
                 '--sourcedir=' + meson.current_source_dir(),
@@ -46,7 +44,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
      input : widgetfactory_gresource,
      output : 'widgetfactory_resources.o',
      command : [ld,
-                 '-z', 'noexecstack',
                 '-r',
                 '-b','binary',
                 '@INPUT@',
@@ -57,7 +54,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
    input : widgetfactory_resources_binary,
    output : 'widgetfactory_resources2.o',
    command : [objcopy,
-                 '--strip-all',
                 '--add-symbol','_g_binary_widgetfactory_resource_data=.data:0',
                 '@INPUT@',
                 '@OUTPUT@'])
@@ -78,7 +74,7 @@ executable('gtk4-widget-factory',
  c_args: common_cflags,
  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -2053,7 +2053,6 @@ activate (GApplication *app)
    { "win.open", { "<Control>o", NULL } },
    { "win.record", { "<Control>r", NULL } },
    { "win.lock", { "<Control>l", NULL } },
-    { "win.fullscreen", { "F11", NULL } },
  };
  struct {
    const char *action_and_target;
@@ -2360,7 +2359,7 @@ activate (GApplication *app)
  model = (GMenuModel *)gtk_builder_get_object (builder, "new_style_context_menu_model");
  set_up_context_popover (widget, model);

-  gtk_window_present (window);
+  gtk_widget_show (GTK_WIDGET (window));

  g_object_unref (builder);
 }
@@ -1927,12 +1927,6 @@ microphone-sensitivity-medium-symbolic</property>
                                            <property name="tooltip-text" translatable="1">Insert something</property>
                                          </object>
                                        </child>
-                                        <child>
-                                          <object class="GtkColorButton">
-                                            <property name="rgba">#9141AC</property>
-                                            <property name="tooltip-text" translatable="1">Select a color</property>
-                                          </object>
-                                        </child>
                                      </object>
                                    </child>
                                    <child>
@@ -7,21 +7,20 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
+dependencies = [ "GObject-2.0" ]
 devhelp = true

-dependencies = ["Gdk-4.0"]
-
-  [dependencies."Gdk-4.0"]
-  name = "GDK"
-  description = "The GTK drawing kit"
-  docs_url = "https://docs.gtk.org/gdk/"
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"

 [theme]
 name = "basic"
 show_index_summary = true

 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"

 [extra]
 content_images = [
@@ -7,20 +7,20 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
-dependencies = ["Gdk-4.0"]
+dependencies = [ "GObject-2.0" ]
 devhelp = true

-  [dependencies."Gdk-4.0"]
-  name = "GDK"
-  description = "The GTK drawing kit"
-  docs_url = "https://docs.gtk.org/gdk4/"
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"

 [theme]
 name = "basic"
 show_index_summary = true

 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"

 [extra]
 content_images = [
@@ -8,7 +8,7 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 description = "The GTK toolkit"
-dependencies = ["GObject-2.0", "Gio-2.0", "cairo-1.0", "Pango-1.0", "GdkPixbuf-2.0"]
+dependencies = [ "GObject-2.0", "cairo-1.0", "Pango-1.0", "GdkWayland-4.0",  "GdkX11-4.0" ]
 devhelp = true
 search_index = true

@@ -17,11 +17,6 @@ search_index = true
  description = "The base type system library"
  docs_url = "https://docs.gtk.org/gobject/"

-  [dependencies."Gio-2.0"]
-  name = "GIO"
-  description = "GObject Interfaces and Objects, Networking, IPC, and I/O"
-  docs_url = "https://docs.gtk.org/gio/"
-
  [dependencies."cairo-1.0"]
  name = "Cairo"
  description = "A 2D graphics library with support for multiple output devices"
@@ -32,19 +27,12 @@ search_index = true
  description = "Text shaping and rendering"
  docs_url = "https://docs.gtk.org/Pango/"

-  [dependencies."GdkPixbuf-2.0"]
-  name = "GdkPixbuf"
-  description = "Image data loading"
-  docs_url = "https://docs.gtk.org/gdk-pixbuf/"
-
-related = ["GdkWayland-4.0", "GdkX11-4.0"]
-
-  [related."GdkWayland-4.0"]
+  [dependencies."GdkWayland-4.0"]
  name = "GdkWayland"
  description = "GDK Wayland Backend"
  docs_url = "https://docs.gtk.org/gdk4-wayland/"

-  [related."GdkX11-4.0"]
+  [dependencies."GdkX11-4.0"]
  name = "GdkX11"
  description = "GDK X11 Backend"
  docs_url = "https://docs.gtk.org/gdk4-x11/"
@@ -55,7 +43,7 @@ show_index_summary = true
 show_class_hierarchy = true

 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"

 [extra]
 content_files = [
@@ -8,16 +8,25 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 description = "The GTK toolkit"
+dependencies = [ "GObject-2.0", "Graphene-1.0", "Pango-1.0", "Gdk-4.0" ]
 devhelp = true
 search_index = true

-dependencies = ["Graphene-1.0", "Gdk-4.0"]
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"

  [dependencies."Graphene-1.0"]
  name = "Graphene"
  description = "A thin layer of mathematical types for 3D libraries"
  docs_url = "https://ebassi.github.io/graphene/docs/"

+  [dependencies."Pango-1.0"]
+  name = "Pango"
+  description = "Text shaping and rendering"
+  docs_url = "https://docs.gtk.org/Pango/"
+
  [dependencies."Gdk-4.0"]
  name = "GDK"
  description = "The GTK windowing system abstraction"
@@ -29,7 +38,7 @@ show_index_summary = true
 show_class_hierarchy = true

 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"

 [extra]
 content_images = [
@@ -170,7 +170,7 @@ activate (GtkApplication *app,
  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
  gtk_widget_set_halign (box, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (box, GTK_ALIGN_CENTER);
-
+  
  gtk_window_set_child (GTK_WINDOW (window), box);

  button = gtk_button_new_with_label ("Hello World");
@@ -752,7 +752,7 @@ templates, resources, application menus, settings, [class@Gtk.HeaderBar], [class

 The full, buildable sources for these examples can be found in the
 `examples` directory of the GTK source distribution, or
-[online](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples) in the GTK
+[online](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples) in the GTK
 source code repository. You can build each example separately by using make
 with the `Makefile.example` file. For more information, see the `README`
 included in the examples directory.
@@ -972,7 +972,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application2/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application2/exampleappwin.c))

 You may have noticed that we used the `_from_resource()` variant of the function
 that sets a template. Now we need to use
@@ -1043,7 +1043,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application3/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c))

 Now we revisit the `example_app_window_open()` function that is called for each
 commandline argument, and construct a GtkTextView that we then add as a page
@@ -1087,7 +1087,7 @@ example_app_window_open (ExampleAppWindow *win,
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application3/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c))

 Lastly, we add a [class@Gtk.StackSwitcher] to the titlebar area in the UI file, and we
 tell it to display information about our stack.
@@ -1188,7 +1188,7 @@ example_app_class_init (ExampleAppClass *class)
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application4/exampleapp.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application4/exampleapp.c))

 Our preferences menu item does not do anything yet, but the Quit menu item
 is fully functional. Note that it can also be activated by the usual Ctrl-Q
@@ -1258,7 +1258,7 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application5/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application5/exampleappwin.c))

 The code to connect the font setting is a little more involved, since there
 is no simple object property that it corresponds to, so we are not going to
@@ -1429,7 +1429,7 @@ preferences_activated (GSimpleAction *action,
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application6/exampleapp.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application6/exampleapp.c))

 After all this work, our application can now show a preference dialog
 like this:
@@ -1549,7 +1549,7 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application7/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application7/exampleappwin.c))

 With the search bar, our application now looks like this:

@@ -1682,7 +1682,7 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application8/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application8/exampleappwin.c))

 What our application looks like now:

@@ -1760,10 +1760,10 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```

-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application9/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c))

 We also need a function that counts the lines of the currently active tab,
-and updates the `lines` label. See the [full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application9/exampleappwin.c)
+and updates the `lines` label. See the [full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c)
 if you are interested in the details.

 This brings our example application to this appearance:
@@ -16,6 +16,7 @@ SYNOPSIS
 |   **gtk4-builder-tool** enumerate <FILE>
 |   **gtk4-builder-tool** simplify [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** preview [OPTIONS...] <FILE>
+|   **gtk4-builder-tool** precompile [OPTIONS...] <FILE>

 DESCRIPTION
 -----------
@@ -83,3 +84,10 @@ to do manual fixups  after the initial conversion.
 ``--3to4``

  Transform a GTK 3 UI definition file to the equivalent GTK 4 definitions.
+
+Precompilation
+^^^^^^^^^^^^^^
+
+The ``precompile`` command creates a more compact, and faster to load compiled
+form of the ui file that is understood by GtkBuilder. The output is written
+to a file with the extension ``.precompiled``.
@@ -8,10 +8,24 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 description = "The GTK toolkit"
+dependencies = [ "GObject-2.0", "Graphene-1.0", "Pango-1.0", "Gdk-4.0", "Gsk-4.0" ]
 devhelp = true
 search_index = true

-dependencies = ["Gdk-4.0", "Gsk-4.0"]
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"
+
+  [dependencies."Graphene-1.0"]
+  name = "Graphene"
+  description = "A thin layer of mathematical types for 3D libraries"
+  docs_url = "https://ebassi.github.io/graphene/docs"
+
+  [dependencies."Pango-1.0"]
+  name = "Pango"
+  description = "Text shaping and rendering"
+  docs_url = "https://docs.gtk.org/Pango/"

  [dependencies."Gdk-4.0"]
  name = "GDK"
@@ -23,35 +37,13 @@ dependencies = ["Gdk-4.0", "Gsk-4.0"]
  description = "The GTK rendering abstraction"
  docs_url = "https://docs.gtk.org/gsk4/"

-related = ["Pango-1.0", "Graphene-1.0", "GObject-2.0", "Gio-2.0"]
-
-  [related."GObject-2.0"]
-  name = "GObject"
-  description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
-
-  [related."Gio-2.0"]
-  name = "GIO"
-  description = "GObject Interfaces and Objects, Networking, IPC, and I/O"
-  docs_url = "https://docs.gtk.org/gio/"
-
-  [related."Graphene-1.0"]
-  name = "Graphene"
-  description = "A thin layer of mathematical types for 3D libraries"
-  docs_url = "https://ebassi.github.io/graphene/docs"
-
-  [related."Pango-1.0"]
-  name = "Pango"
-  description = "Text shaping and rendering"
-  docs_url = "https://docs.gtk.org/Pango/"
-
 [theme]
 name = "basic"
 show_index_summary = true
 show_class_hierarchy = true

 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"

 [extra]
 # The same order will be used when generating the index
@@ -42,7 +42,7 @@ univocally identifies events that are related to the same
 interaction.

 When GTK creates a `GdkSurface`, it connects to the ::event
-signal on it, which receives all of these input events. Surfaces
+signal on it, which receives all of these input events. Surfaces have
 have signals and properties, e.g. to deal with window management
 related events.

@@ -57,7 +57,7 @@ if get_option('gtk_doc')
  )
 endif

-rst2man = find_program('rst2man', 'rst2man.py', required: false)
+rst2man = find_program('rst2man', required: false)
 if get_option('man-pages') and not rst2man.found()
  error('No rst2man found, but man pages were explicitly enabled')
 endif
@@ -1276,15 +1276,6 @@ is provided in the form of a `GtkIconPaintable` (this can be checked with
 [method@Gtk.IconPaintable.is_symbolic]), you have to call
 [method@Gtk.IconPaintable.get_icon_name] and set the icon name on a `GtkImage`.

-### Adapt to GtkImage changes
-`GtkPicture`'s behaviour was "split out" of `GtkImage` as the latter was covering
-too many use cases; if you're loading an icon, [class@Gtk.Image] in GTK3 and GTK4 are
-perfectly equivalent. If you are loading a more complex image asset, like a picture
-or a thumbnail, then [class@Gtk.Picture] is the appropriate widget.
-
-One noteworthy distinction is that while `GtkImage` has its size computed by
-GTK, `GtkPicture` lets you decide about the size.
-
 ### Update to GtkFileChooser API changes

 `GtkFileChooser` moved to a GFile-based API. If you need to convert a path
@@ -1382,5 +1373,5 @@ a new family of widgets for this purpose that uses list models instead
 of tree models, and widgets instead of cell renderers.

 To learn more about the new list widgets, you can read the [List Widget
-Overview](https://docs.gtk.org/gtk4/section-list-widget.html).
+Overview](#ListWidget).

@@ -26,7 +26,7 @@ GTK with your code applied, and run the test suite, on multiple platforms
 and architectures, and verify that nothing breaks. They also allow us to
 do proper code reviews, so we can iterate over the changes.

-You should follow the [contribution guide](https://gitlab.gnome.org/GNOME/gtk/blob/main/CONTRIBUTING.md)
+You should follow the [contribution guide](https://gitlab.gnome.org/GNOME/gtk/blob/master/CONTRIBUTING.md)
 for GTK, available on GitLab.

 If you want to discuss your approach before or after working on it,
@@ -286,7 +286,7 @@ requires that GTK is compiled with support for that backend.
 The following backends can be selected, provided they are
 included in the GDK libraries you are using:

-`macos`
+`quartz`
 : Selects the native Quartz backend

 `win32`
@@ -336,6 +336,9 @@ using and the GDK backend supports them:
 `gl`
 : Selects the "gl" OpenGL renderer

+`ngl`
+: Selects the "ngl" OpenGL renderer
+
 `vulkan`
 : Selects the Vulkan renderer

@@ -372,7 +375,7 @@ library you are using:
 The `test` accessibility backend is recommended for test suites and remote
 continuous integration pipelines.

-### `XDG_DATA_HOME`, `XDG_DATA_DIRS`
+### `XDG_DTA_HOME`, `XDG_DATA_DIRS`

 GTK uses these environment variables to locate icon themes
 and MIME information. For more information, see the
@@ -31,7 +31,8 @@
 * `GdkAppLaunchContext` handles launching an application in a graphical context.
 *
 * It is an implementation of `GAppLaunchContext` that provides startup
- * notification and allows to launch applications on a specific workspace.
+ * notification and allows to launch applications on a specific screen
+ * or workspace.
 *
 * ## Launching an application
 *
@@ -40,6 +41,7 @@
 *
 * context = gdk_display_get_app_launch_context (display);
 *
+ * gdk_app_launch_context_set_display (display);
 * gdk_app_launch_context_set_timestamp (gdk_event_get_time (event));
 *
 * if (!g_app_info_launch_default_for_uri ("http://www.gtk.org", context, &error))
@@ -194,10 +196,6 @@ gdk_app_launch_context_get_display (GdkAppLaunchContext *context)
 * This only works when running under a window manager that
 * supports multiple workspaces, as described in the
 * [Extended Window Manager Hints](http://www.freedesktop.org/Standards/wm-spec).
- * Specifically this sets the `_NET_WM_DESKTOP` property described
- * in that spec.
- *
- * This only works when using the X11 backend.
 *
 * When the workspace is not specified or @desktop is set to -1,
 * it is up to the window manager to pick one, typically it will
@@ -264,7 +264,7 @@ gdk_content_deserializer_get_priority (GdkContentDeserializer *deserializer)
 *
 * This is the `GCancellable` that was passed to [func@Gdk.content_deserialize_async].
 *
- * Returns: (transfer none) (nullable): the cancellable for the current operation
+ * Returns: (transfer none): the cancellable for the current operation
 */
 GCancellable *
 gdk_content_deserializer_get_cancellable (GdkContentDeserializer *deserializer)
@@ -576,7 +576,7 @@ gdk_content_deserialize_async (GInputStream        *stream,
 /**
 * gdk_content_deserialize_finish:
 * @result: the `GAsyncResult`
- * @value: (out): return location for the result of the operation
+ * @value: return location for the result of the operation
 * @error: return location for an error
 *
 * Finishes a content deserialization operation.
@@ -342,7 +342,7 @@ gdk_content_provider_write_mime_type_finish (GdkContentProvider  *provider,
 /**
 * gdk_content_provider_get_value:
 * @provider: a `GdkContentProvider`
- * @value: (out caller-allocates): the `GValue` to fill
+ * @value: the `GValue` to fill
 * @error: a `GError` location to store the error occurring
 *
 * Gets the contents of @provider stored in @value.
@@ -270,7 +270,7 @@ gdk_content_serializer_get_priority (GdkContentSerializer *serializer)
 *
 * This is the `GCancellable` that was passed to [func@content_serialize_async].
 *
- * Returns: (transfer none) (nullable): the cancellable for the current operation
+ * Returns: (transfer none): the cancellable for the current operation
 */
 GCancellable *
 gdk_content_serializer_get_cancellable (GdkContentSerializer *serializer)
@@ -47,7 +47,8 @@
 * Cursors by themselves are not very interesting: they must be bound to a
 * window for users to see them. This is done with [method@Gdk.Surface.set_cursor]
 * or [method@Gdk.Surface.set_device_cursor]. Applications will typically
- * use higher-level GTK functions such as [method@Gtk.Widget.set_cursor] instead.
+ * use higher-level GTK functions such as [method@Gtk.Widget.set_cursor]`
+ * instead.
 *
 * Cursors are not bound to a given [class@Gdk.Display], so they can be shared.
 * However, the appearance of cursors may vary when used on different
@@ -132,6 +132,8 @@ gdk_device_class_init (GdkDeviceClass *klass)
   * GdkDevice:source: (attributes org.gtk.Property.get=gdk_device_get_source)
   *
   * Source type for the device.
+   *
+   * Deprecated: 4.6: Use GdkDeviceTool:tool-type instead
   */
  device_props[PROP_SOURCE] =
      g_param_spec_enum ("source",
@@ -596,6 +598,8 @@ gdk_device_get_has_cursor (GdkDevice *device)
 * Determines the type of the device.
 *
 * Returns: a `GdkInputSource`
+ *
+ * Deprecated: 4.6: Use gdk_device_tool_get_tool_type() instead
 */
 GdkInputSource
 gdk_device_get_source (GdkDevice *device)
@@ -1238,7 +1242,7 @@ gdk_device_get_num_touches (GdkDevice *device)
 *
 * Retrieves the current tool for @device.
 *
- * Returns: (transfer none) (nullable): the `GdkDeviceTool`
+ * Returns: (transfer none): the `GdkDeviceTool`
 */
 GdkDeviceTool *
 gdk_device_get_device_tool (GdkDevice *device)
@@ -92,7 +92,7 @@ GDK_AVAILABLE_IN_ALL
 GdkDisplay *        gdk_device_get_display              (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL
 GdkSeat *           gdk_device_get_seat                 (GdkDevice *device);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_6_FOR(gdk_device_tool_get_tool_type)
 GdkDeviceTool *     gdk_device_get_device_tool          (GdkDevice *device);

 GDK_AVAILABLE_IN_ALL
@@ -1721,12 +1721,12 @@ gdk_display_init_egl (GdkDisplay  *self,

  self->have_egl_buffer_age =
    epoxy_has_egl_extension (priv->egl_display, "EGL_EXT_buffer_age");
+  self->have_egl_swap_buffers_with_damage =
+    epoxy_has_egl_extension (priv->egl_display, "EGL_EXT_swap_buffers_with_damage");
  self->have_egl_no_config_context =
    epoxy_has_egl_extension (priv->egl_display, "EGL_KHR_no_config_context");
  self->have_egl_pixel_format_float =
    epoxy_has_egl_extension (priv->egl_display, "EGL_EXT_pixel_format_float");
-  self->have_egl_win32_libangle =
-    epoxy_has_egl_extension (priv->egl_display, "EGL_ANGLE_d3d_share_handle_client_buffer");

  if (self->have_egl_no_config_context)
    priv->egl_config_high_depth = gdk_display_create_egl_config (self,
@@ -107,9 +107,9 @@ struct _GdkDisplay

  /* egl info */
  guint have_egl_buffer_age : 1;
+  guint have_egl_swap_buffers_with_damage : 1;
  guint have_egl_no_config_context : 1;
  guint have_egl_pixel_format_float : 1;
-  guint have_egl_win32_libangle : 1;
 };

 struct _GdkDisplayClass
@@ -19,7 +19,7 @@
 * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GTK+ Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
 */

 #include "config.h"
@@ -522,9 +522,7 @@ _gdk_event_queue_find_first (GdkDisplay *display)
          if (pending_motion)
            return pending_motion;

-          if ((event->event_type == GDK_MOTION_NOTIFY ||
-               (event->event_type == GDK_SCROLL && gdk_scroll_event_get_direction (event) == GDK_SCROLL_SMOOTH)) &&
-              (event->flags & GDK_EVENT_FLUSHED) == 0)
+          if (event->event_type == GDK_MOTION_NOTIFY && (event->flags & GDK_EVENT_FLUSHED) == 0)
            pending_motion = tmp_list;
          else
            return tmp_list;
@@ -597,11 +595,7 @@ _gdk_event_unqueue (GdkDisplay *display)

 /*
 * If the last N events in the event queue are smooth scroll events
- * for the same surface, the same device and the same scroll unit,
- * combine them into one.
- *
- * We give the remaining event a history with N items, and deltas
- * that are the sum over the history entries.
+ * for the same surface and device, combine them into one.
 */
 void
 gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
@@ -611,9 +605,8 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
  GdkDevice *device = NULL;
  GdkEvent *last_event = NULL;
  GList *scrolls = NULL;
+  double delta_x, delta_y;
  GArray *history = NULL;
-  GdkScrollUnit scroll_unit = GDK_SCROLL_UNIT_WHEEL;
-  gboolean scroll_unit_defined = FALSE;
  GdkTimeCoord hist;

  l = g_queue_peek_tail_link (&display->queued_events);
@@ -621,7 +614,6 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
  while (l)
    {
      GdkEvent *event = l->data;
-      GdkScrollEvent *scroll_event = (GdkScrollEvent *) event;

      if (event->flags & GDK_EVENT_PENDING)
        break;
@@ -638,58 +630,45 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
          device != event->device)
        break;

-      if (scroll_unit_defined &&
-          scroll_unit != scroll_event->unit)
-        break;
-
      if (!last_event)
        last_event = event;

      surface = event->surface;
      device = event->device;
-      scroll_unit = scroll_event->unit;
-      scroll_unit_defined = TRUE;
      scrolls = l;

      l = l->prev;
    }

+  delta_x = delta_y = 0;
+
  while (scrolls && scrolls->next != NULL)
    {
      GdkEvent *event = scrolls->data;
      GList *next = scrolls->next;
      double dx, dy;
-      gboolean inherited = FALSE;
-
-      if (!history && ((GdkScrollEvent *)event)->history)
-        {
-          history = ((GdkScrollEvent *)event)->history;
-          ((GdkScrollEvent *)event)->history = NULL;
-          inherited = TRUE;
-        }

      if (!history)
        history = g_array_new (FALSE, TRUE, sizeof (GdkTimeCoord));

-      if (!inherited)
-        {
-          gdk_scroll_event_get_deltas (event, &dx, &dy);
+      gdk_scroll_event_get_deltas (event, &dx, &dy);
+      delta_x += dx;
+      delta_y += dy;

-          memset (&hist, 0, sizeof (GdkTimeCoord));
-          hist.time = gdk_event_get_time (event);
-          hist.flags = GDK_AXIS_FLAG_DELTA_X | GDK_AXIS_FLAG_DELTA_Y;
-          hist.axes[GDK_AXIS_DELTA_X] = dx;
-          hist.axes[GDK_AXIS_DELTA_Y] = dy;
+      memset (&hist, 0, sizeof (GdkTimeCoord));
+      hist.time = gdk_event_get_time (event);
+      hist.flags = GDK_AXIS_FLAG_DELTA_X | GDK_AXIS_FLAG_DELTA_Y;
+      hist.axes[GDK_AXIS_DELTA_X] = dx;
+      hist.axes[GDK_AXIS_DELTA_Y] = dy;

-          g_array_append_val (history, hist);
-       }
+      g_array_append_val (history, hist);

      gdk_event_unref (event);
      g_queue_delete_link (&display->queued_events, scrolls);
      scrolls = next;
    }

-  if (scrolls && history)
+  if (scrolls)
    {
      GdkEvent *old_event, *event;
      double dx, dy;
@@ -697,31 +676,14 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
      old_event = scrolls->data;

      gdk_scroll_event_get_deltas (old_event, &dx, &dy);
-
-      memset (&hist, 0, sizeof (GdkTimeCoord));
-      hist.time = gdk_event_get_time (old_event);
-      hist.flags = GDK_AXIS_FLAG_DELTA_X | GDK_AXIS_FLAG_DELTA_Y;
-      hist.axes[GDK_AXIS_DELTA_X] = dx;
-      hist.axes[GDK_AXIS_DELTA_Y] = dy;
-      g_array_append_val (history, hist);
-
-      dx = dy = 0;
-      for (int i = 0; i < history->len; i++)
-        {
-          GdkTimeCoord *val = &g_array_index (history, GdkTimeCoord, i);
-          dx += val->axes[GDK_AXIS_DELTA_X];
-          dy += val->axes[GDK_AXIS_DELTA_Y];
-        }
-
      event = gdk_scroll_event_new (surface,
                                    device,
                                    gdk_event_get_device_tool (old_event),
                                    gdk_event_get_time (old_event),
                                    gdk_event_get_modifier_state (old_event),
-                                    dx,
-                                    dy,
-                                    gdk_scroll_event_is_stop (old_event),
-                                    scroll_unit);
+                                    delta_x + dx,
+                                    delta_y + dy,
+                                    gdk_scroll_event_is_stop (old_event));

      ((GdkScrollEvent *)event)->history = history;

@@ -730,6 +692,14 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)

      gdk_event_unref (old_event);
    }
+
+  if (g_queue_get_length (&display->queued_events) == 1 &&
+      g_queue_peek_head_link (&display->queued_events) == scrolls)
+    {
+      GdkFrameClock *clock = gdk_surface_get_frame_clock (surface);
+      if (clock) /* might be NULL if surface was destroyed */
+        gdk_frame_clock_request_phase (clock, GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS);
+    }
 }

 static void
@@ -744,47 +714,24 @@ gdk_motion_event_push_history (GdkEvent *event,
  g_assert (GDK_IS_EVENT_TYPE (event, GDK_MOTION_NOTIFY));
  g_assert (GDK_IS_EVENT_TYPE (history_event, GDK_MOTION_NOTIFY));

-  if (G_UNLIKELY (!self->history))
-    self->history = g_array_new (FALSE, TRUE, sizeof (GdkTimeCoord));
-
-  if (((GdkMotionEvent *)history_event)->history)
-    {
-      GArray *history = ((GdkMotionEvent *)history_event)->history;
-      g_array_append_vals (self->history, history->data, history->len);
-    }
+  if (!self->tool)
+    return;

  tool = gdk_event_get_device_tool (history_event);

  memset (&hist, 0, sizeof (GdkTimeCoord));
  hist.time = gdk_event_get_time (history_event);
+  hist.flags = gdk_device_tool_get_axes (tool);

-  if (tool)
-    {
-      hist.flags = gdk_device_tool_get_axes (tool);
-      for (i = GDK_AXIS_X; i < GDK_AXIS_LAST; i++)
-        gdk_event_get_axis (history_event, i, &hist.axes[i]);
-    }
+  for (i = GDK_AXIS_X; i < GDK_AXIS_LAST; i++)
+    gdk_event_get_axis (history_event, i, &hist.axes[i]);

-  /* GdkTimeCoord has no dedicated fields to record event position. For plain
-   * pointer events, and for tools which don't report GDK_AXIS_X/GDK_AXIS_Y
-   * on their own, we surface the position using the X and Y input axes.
-   */
-  if (!(hist.flags & GDK_AXIS_FLAG_X) || !(hist.flags & GDK_AXIS_FLAG_Y))
-    {
-      hist.flags |= GDK_AXIS_FLAG_X | GDK_AXIS_FLAG_Y;
-      gdk_event_get_position (history_event, &hist.axes[GDK_AXIS_X], &hist.axes[GDK_AXIS_Y]);
-    }
+  if (G_UNLIKELY (!self->history))
+    self->history = g_array_new (FALSE, TRUE, sizeof (GdkTimeCoord));

  g_array_append_val (self->history, hist);
 }

-/* If the last N events in the event queue are motion notify
- * events for the same surface, drop all but the last.
- *
- * If a button is held down or the device has a tool, then
- * we give the remaining events a history containing the N-1
- * dropped events.
- */
 void
 _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
 {
@@ -794,6 +741,9 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
  GdkDevice *pending_motion_device = NULL;
  GdkEvent *last_motion = NULL;

+  /* If the last N events in the event queue are motion notify
+   * events for the same surface, drop all but the last */
+
  tmp_list = g_queue_peek_tail_link (&display->queued_events);

  while (tmp_list)
@@ -830,17 +780,26 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)

      if (last_motion != NULL)
        {
-          if ((gdk_event_get_modifier_state (last_motion) &
-               (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK |
-                GDK_BUTTON4_MASK | GDK_BUTTON5_MASK)) ||
-               gdk_event_get_device_tool (last_motion) != NULL)
-            gdk_motion_event_push_history (last_motion, pending_motions->data);
+          GdkModifierType state = gdk_event_get_modifier_state (last_motion);
+
+          if (state &
+              (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK |
+               GDK_BUTTON4_MASK | GDK_BUTTON5_MASK))
+           gdk_motion_event_push_history (last_motion, pending_motions->data);
        }

      gdk_event_unref (pending_motions->data);
      g_queue_delete_link (&display->queued_events, pending_motions);
      pending_motions = next;
    }
+
+  if (g_queue_get_length (&display->queued_events) == 1 &&
+      g_queue_peek_head_link (&display->queued_events) == pending_motions)
+    {
+      GdkFrameClock *clock = gdk_surface_get_frame_clock (pending_motion_surface);
+      if (clock) /* might be NULL if surface was destroyed */
+        gdk_frame_clock_request_phase (clock, GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS);
+    }
 }

 void
@@ -944,9 +903,6 @@ gdk_event_get_pointer_emulated (GdkEvent *event)
 * Extract the axis value for a particular axis use from
 * an event structure.
 *
- * To find out which axes are used, use [method@Gdk.DeviceTool.get_axes]
- * on the device tool returned by [method@Gdk.Event.get_device_tool].
- *
 * Returns: %TRUE if the specified axis was found, otherwise %FALSE
 */
 gboolean
@@ -1173,9 +1129,6 @@ G_DEFINE_BOXED_TYPE (GdkEventSequence, gdk_event_sequence,
 *
 * Extracts all axis values from an event.
 *
- * To find out which axes are used, use [method@Gdk.DeviceTool.get_axes]
- * on the device tool returned by [method@Gdk.Event.get_device_tool].
- *
 * Returns: %TRUE on success, otherwise %FALSE
 */
 gboolean
@@ -1226,7 +1179,7 @@ gdk_event_get_event_type (GdkEvent *event)
 *
 * Extracts the surface associated with an event.
 *
- * Returns: (transfer none) (nullable): The `GdkSurface` associated with the event
+ * Returns: (transfer none): The `GdkSurface` associated with the event
 */
 GdkSurface *
 gdk_event_get_surface (GdkEvent *event)
@@ -2351,8 +2304,7 @@ gdk_scroll_event_new (GdkSurface      *surface,
                      GdkModifierType  state,
                      double           delta_x,
                      double           delta_y,
-                      gboolean         is_stop,
-                      GdkScrollUnit    unit)
+                      gboolean         is_stop)
 {
  GdkScrollEvent *self = gdk_event_alloc (GDK_SCROLL, surface, device, time);

@@ -2362,7 +2314,6 @@ gdk_scroll_event_new (GdkSurface      *surface,
  self->delta_x = delta_x;
  self->delta_y = delta_y;
  self->is_stop = is_stop;
-  self->unit = unit;

  return (GdkEvent *) self;
 }
@@ -2382,7 +2333,6 @@ gdk_scroll_event_new_discrete (GdkSurface         *surface,
  self->state = state;
  self->direction = direction;
  self->pointer_emulated = emulated;
-  self->unit = GDK_SCROLL_UNIT_WHEEL;

  return (GdkEvent *) self;
 }
@@ -2416,9 +2366,6 @@ gdk_scroll_event_get_direction (GdkEvent *event)
 *
 * The deltas will be zero unless the scroll direction
 * is %GDK_SCROLL_SMOOTH.
- *
- * For the representation unit of these deltas, see
- * [method@Gdk.ScrollEvent.get_unit].
 */
 void
 gdk_scroll_event_get_deltas (GdkEvent *event,
@@ -2461,31 +2408,6 @@ gdk_scroll_event_is_stop (GdkEvent *event)
  return self->is_stop;
 }

-/**
- * gdk_scroll_event_get_unit:
- * @event: (type GdkScrollEvent): a scroll event.
- *
- * Extracts the scroll delta unit of a scroll event.
- *
- * The unit will always be %GDK_SCROLL_UNIT_WHEEL if the scroll direction is not
- * %GDK_SCROLL_SMOOTH.
- *
- * Returns: the scroll unit.
- *
- * Since: 4.8
- */
-GdkScrollUnit
-gdk_scroll_event_get_unit (GdkEvent *event)
-{
-  GdkScrollEvent *self = (GdkScrollEvent *) event;
-
-  g_return_val_if_fail (GDK_IS_EVENT (event), GDK_SCROLL_UNIT_WHEEL);
-  g_return_val_if_fail (GDK_IS_EVENT_TYPE (event, GDK_SCROLL),
-                        GDK_SCROLL_UNIT_WHEEL);
-
-  return self->unit;
-}
-
 /* }}} */

 /* {{{ GdkTouchpadEvent */
@@ -2509,14 +2431,6 @@ gdk_touchpad_event_get_state (GdkEvent *event)
  return self->state;
 }

-static GdkEventSequence *
-gdk_touchpad_event_get_sequence (GdkEvent *event)
-{
-  GdkTouchpadEvent *self = (GdkTouchpadEvent *) event;
-
-  return self->sequence;
-}
-
 static gboolean
 gdk_touchpad_event_get_position (GdkEvent *event,
                                 double   *x,
@@ -2536,7 +2450,7 @@ static const GdkEventTypeInfo gdk_touchpad_event_info = {
  NULL,
  gdk_touchpad_event_get_state,
  gdk_touchpad_event_get_position,
-  gdk_touchpad_event_get_sequence,
+  NULL,
  NULL,
  NULL,
 };
@@ -2544,32 +2458,22 @@ static const GdkEventTypeInfo gdk_touchpad_event_info = {
 GDK_DEFINE_EVENT_TYPE (GdkTouchpadEvent, gdk_touchpad_event,
                       &gdk_touchpad_event_info,
                       GDK_EVENT_TYPE_SLOT (GDK_TOUCHPAD_SWIPE)
-                       GDK_EVENT_TYPE_SLOT (GDK_TOUCHPAD_PINCH)
-                       GDK_EVENT_TYPE_SLOT (GDK_TOUCHPAD_HOLD))
+                       GDK_EVENT_TYPE_SLOT (GDK_TOUCHPAD_PINCH))

 GdkEvent *
-gdk_touchpad_event_new_swipe (GdkSurface              *surface,
-                              GdkEventSequence        *sequence,
-                              GdkDevice               *device,
-                              guint32                  time,
-                              GdkModifierType          state,
-                              GdkTouchpadGesturePhase  phase,
-                              double                   x,
-                              double                   y,
-                              int                      n_fingers,
-                              double                   dx,
-                              double                   dy)
+gdk_touchpad_event_new_swipe (GdkSurface *surface,
+                              GdkDevice  *device,
+                              guint32     time,
+                              GdkModifierType state,
+                              GdkTouchpadGesturePhase phase,
+                              double      x,
+                              double      y,
+                              int         n_fingers,
+                              double      dx,
+                              double      dy)
 {
-  GdkTouchpadEvent *self;
+  GdkTouchpadEvent *self = gdk_event_alloc (GDK_TOUCHPAD_SWIPE, surface, device, time);

-  g_return_val_if_fail (phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
-                        phase == GDK_TOUCHPAD_GESTURE_PHASE_END ||
-                        phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE ||
-                        phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL, NULL);
-
-  self = gdk_event_alloc (GDK_TOUCHPAD_SWIPE, surface, device, time);
-
-  self->sequence = sequence;
  self->state = state;
  self->phase = phase;
  self->x = x;
@@ -2582,30 +2486,21 @@ gdk_touchpad_event_new_swipe (GdkSurface              *surface,
 }

 GdkEvent *
-gdk_touchpad_event_new_pinch (GdkSurface              *surface,
-                              GdkEventSequence        *sequence,
-                              GdkDevice               *device,
-                              guint32                  time,
-                              GdkModifierType          state,
-                              GdkTouchpadGesturePhase  phase,
-                              double                   x,
-                              double                   y,
-                              int                      n_fingers,
-                              double                   dx,
-                              double                   dy,
-                              double                   scale,
-                              double                   angle_delta)
+gdk_touchpad_event_new_pinch (GdkSurface *surface,
+                              GdkDevice  *device,
+                              guint32     time,
+                              GdkModifierType state,
+                              GdkTouchpadGesturePhase phase,
+                              double      x,
+                              double      y,
+                              int         n_fingers,
+                              double      dx,
+                              double      dy,
+                              double      scale,
+                              double      angle_delta)
 {
-  GdkTouchpadEvent *self;
+  GdkTouchpadEvent *self = gdk_event_alloc (GDK_TOUCHPAD_PINCH, surface, device, time);

-  g_return_val_if_fail (phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
-                        phase == GDK_TOUCHPAD_GESTURE_PHASE_END ||
-                        phase == GDK_TOUCHPAD_GESTURE_PHASE_UPDATE ||
-                        phase == GDK_TOUCHPAD_GESTURE_PHASE_CANCEL, NULL);
-
-  self = gdk_event_alloc (GDK_TOUCHPAD_PINCH, surface, device, time);
-
-  self->sequence = sequence;
  self->state = state;
  self->phase = phase;
  self->x = x;
@@ -2619,27 +2514,6 @@ gdk_touchpad_event_new_pinch (GdkSurface              *surface,
  return (GdkEvent *) self;
 }

-GdkEvent *
-gdk_touchpad_event_new_hold (GdkSurface              *surface,
-                             GdkDevice               *device,
-                             guint32                  time,
-                             GdkModifierType          state,
-                             GdkTouchpadGesturePhase  phase,
-                             double                   x,
-                             double                   y,
-                             int                      n_fingers)
-{
-  GdkTouchpadEvent *self = gdk_event_alloc (GDK_TOUCHPAD_HOLD, surface, device, time);
-
-  self->state = state;
-  self->phase = phase;
-  self->x = x;
-  self->y = y;
-  self->n_fingers = n_fingers;
-
-  return (GdkEvent *) self;
-}
-
 /**
 * gdk_touchpad_event_get_gesture_phase:
 * @event: (type GdkTouchpadEvent): a touchpad event
@@ -2655,8 +2529,7 @@ gdk_touchpad_event_get_gesture_phase (GdkEvent *event)

  g_return_val_if_fail (GDK_IS_EVENT (event), 0);
  g_return_val_if_fail (GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_PINCH) ||
-                        GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_SWIPE) ||
-                        GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_HOLD), 0);
+                        GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_SWIPE), 0);

  return self->phase;
 }
@@ -2676,8 +2549,7 @@ gdk_touchpad_event_get_n_fingers (GdkEvent *event)

  g_return_val_if_fail (GDK_IS_EVENT (event), 0);
  g_return_val_if_fail (GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_PINCH) ||
-                        GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_SWIPE) ||
-                        GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_HOLD), 0);
+                        GDK_IS_EVENT_TYPE (event, GDK_TOUCHPAD_SWIPE), 0);

  return self->n_fingers;
 }
@@ -3035,8 +2907,7 @@ gdk_motion_event_new (GdkSurface      *surface,
 * to the application because they occurred in the same frame as @event.
 *
 * Note that only motion and scroll events record history, and motion
- * events do it only if one of the mouse buttons is down, or the device
- * has a tool.
+ * events do it only if one of the mouse buttons is down.
 *
 * Returns: (transfer container) (array length=out_n_coords) (nullable): an
 *   array of time and coordinates
@@ -169,8 +169,6 @@ typedef struct _GdkTouchpadEvent        GdkTouchpadEvent;
 * @GDK_PAD_RING: A tablet pad axis event from a "ring".
 * @GDK_PAD_STRIP: A tablet pad axis event from a "strip".
 * @GDK_PAD_GROUP_MODE: A tablet pad group mode change.
- * @GDK_TOUCHPAD_HOLD: A touchpad hold gesture event, the current state
- *   is determined by its phase field. Since: 4.6
 * @GDK_EVENT_LAST: marks the end of the GdkEventType enumeration.
 *
 * Specifies the type of the event.
@@ -205,7 +203,6 @@ typedef enum
  GDK_PAD_RING,
  GDK_PAD_STRIP,
  GDK_PAD_GROUP_MODE,
-  GDK_TOUCHPAD_HOLD,
  GDK_EVENT_LAST        /* helper variable for decls */
 } GdkEventType;

@@ -265,37 +262,6 @@ typedef enum
  GDK_SCROLL_SMOOTH
 } GdkScrollDirection;

-/**
- * GdkScrollUnit:
- * @GDK_SCROLL_UNIT_WHEEL: The delta is in number of wheel clicks.
- * @GDK_SCROLL_UNIT_SURFACE: The delta is in surface pixels to scroll directly
- *   on screen.
- *
- * Specifies the unit of scroll deltas.
- *
- * When you get %GDK_SCROLL_UNIT_WHEEL, a delta of 1.0 means 1 wheel detent
- * click in the south direction, 2.0 means 2 wheel detent clicks in the south
- * direction... This is the same logic for negative values but in the north
- * direction.
- *
- * If you get %GDK_SCROLL_UNIT_SURFACE, are managing a scrollable view and get a
- * value of 123, you have to scroll 123 surface logical pixels right if it's
- * @delta_x or down if it's @delta_y. This is the same logic for negative values
- * but you have to scroll left instead of right if it's @delta_x and up instead
- * of down if it's @delta_y.
- *
- * 1 surface logical pixel is equal to 1 real screen pixel multiplied by the
- * final scale factor of your graphical interface (the product of the desktop
- * scale factor and eventually a custom scale factor in your app).
- *
- * Since: 4.8
- */
-typedef enum
-{
-  GDK_SCROLL_UNIT_WHEEL,
-  GDK_SCROLL_UNIT_SURFACE
-} GdkScrollUnit;
-
 /**
 * GdkNotifyType:
 * @GDK_NOTIFY_ANCESTOR: the surface is entered from an ancestor or
@@ -426,8 +392,6 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_scroll_event_get_deltas     (GdkEvent *event,
                                                         double   *delta_x,
                                                         double   *delta_y);
-GDK_AVAILABLE_IN_4_8
-GdkScrollUnit           gdk_scroll_event_get_unit       (GdkEvent *event);

 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_scroll_event_is_stop        (GdkEvent *event);
@@ -209,10 +209,9 @@ struct _GdkTouchEvent
 * @pointer_emulated: whether the scroll event was the result of
 *   a pointer emulation
 * @tool: a `GdkDeviceTool`
- * @history: (element-type GdkTimeCoord): array of times and deltas
+ * @history: (element-type GdkScrollHistory): array of times and deltas
 *   for other scroll events that were compressed before delivering the
 *   current event
- * @unit: The scroll unit in which delta_x and delta_y are represented.
 *
 * Generated from button presses for the buttons 4 to 7. Wheel mice are
 * usually configured to generate button press events for buttons 4 and 5
@@ -234,8 +233,7 @@ struct _GdkScrollEvent
  gboolean pointer_emulated;
  gboolean is_stop;
  GdkDeviceTool *tool;
-  GArray *history; /* <GdkTimeCoord> */
-  GdkScrollUnit unit;
+  GArray *history; /* <GdkScrollHistory> */
 };

 /*
@@ -404,7 +402,6 @@ struct _GdkTouchpadEvent
 {
  GdkEvent parent_instance;

-  GdkEventSequence *sequence;
  GdkModifierType state;
  gint8 phase;
  gint8 n_fingers;
@@ -488,8 +485,7 @@ GdkEvent * gdk_scroll_event_new         (GdkSurface      *surface,
                                         GdkModifierType  state,
                                         double           delta_x,
                                         double           delta_y,
-                                         gboolean         is_stop,
-                                         GdkScrollUnit    unit);
+                                         gboolean         is_stop);

 GdkEvent * gdk_scroll_event_new_discrete (GdkSurface         *surface,
                                          GdkDevice          *device,
@@ -510,20 +506,18 @@ GdkEvent * gdk_touch_event_new          (GdkEventType      type,
                                         double           *axes,
                                         gboolean          emulating);

-GdkEvent * gdk_touchpad_event_new_swipe (GdkSurface              *surface,
-                                         GdkEventSequence        *sequence,
-                                         GdkDevice               *device,
-                                         guint32                  time,
-                                         GdkModifierType          state,
+GdkEvent * gdk_touchpad_event_new_swipe (GdkSurface      *surface,
+                                         GdkDevice       *device,
+                                         guint32          time,
+                                         GdkModifierType  state,
                                         GdkTouchpadGesturePhase  phase,
-                                         double                   x,
-                                         double                   y,
-                                         int                      n_fingers,
-                                         double                   dx,
-                                         double                   dy);
+                                         double           x,
+                                         double           y,
+                                         int              n_fingers,
+                                         double           dx,
+                                         double           dy);

 GdkEvent * gdk_touchpad_event_new_pinch (GdkSurface              *surface,
-                                         GdkEventSequence        *sequence,
                                         GdkDevice               *device,
                                         guint32                  time,
                                         GdkModifierType          state,
@@ -536,15 +530,6 @@ GdkEvent * gdk_touchpad_event_new_pinch (GdkSurface              *surface,
                                         double                   scale,
                                         double                   angle_delta);

-GdkEvent * gdk_touchpad_event_new_hold  (GdkSurface              *surface,
-                                         GdkDevice               *device,
-                                         guint32                  time,
-                                         GdkModifierType          state,
-                                         GdkTouchpadGesturePhase  phase,
-                                         double                   x,
-                                         double                   y,
-                                         int                      n_fingers);
-
 GdkEvent * gdk_pad_event_new_ring       (GdkSurface      *surface,
                                         GdkDevice       *device,
                                         guint32          time,
@@ -117,7 +117,6 @@ typedef struct {

 #ifdef HAVE_EGL
  EGLContext egl_context;
-  EGLBoolean (*eglSwapBuffersWithDamage) (EGLDisplay, EGLSurface, const EGLint *, EGLint);
 #endif
 } GdkGLContextPrivate;

@@ -152,12 +151,6 @@ unmask_context (MaskedContext *mask)
  return GDK_GL_CONTEXT (GSIZE_TO_POINTER (GPOINTER_TO_SIZE (mask) & ~(gsize) 1));
 }

-static inline gboolean
-mask_is_surfaceless (MaskedContext *mask)
-{
-  return GPOINTER_TO_SIZE (mask) & (gsize) 1;
-}
-
 static void
 unref_unmasked (gpointer data)
 {
@@ -186,7 +179,8 @@ gdk_gl_context_dispose (GObject *gobject)

  if (priv->egl_context != NULL)
    {
-      GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
+      GdkSurface *surface = gdk_gl_context_get_surface (context);
+      GdkDisplay *display = gdk_surface_get_display (surface);
      EGLDisplay *egl_display = gdk_display_get_egl_display (display);

      if (eglGetCurrentContext () == priv->egl_context)
@@ -279,11 +273,7 @@ gdk_gl_context_real_realize (GdkGLContext  *context,
      int i = 0;
      G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;

-      if (share != NULL)
-        gdk_gl_context_get_required_version (share, &major, &minor);
-      else
-        gdk_gl_context_get_required_version (context, &major, &minor);
-
+      gdk_gl_context_get_required_version (context, &major, &minor);
      debug_bit = gdk_gl_context_get_debug_enabled (context);
      forward_bit = gdk_gl_context_get_forward_compatible (context);
      legacy_bit = GDK_DISPLAY_DEBUG_CHECK (display, GL_LEGACY) ||
@@ -421,11 +411,6 @@ gdk_gl_context_real_realize (GdkGLContext  *context,

      gdk_gl_context_set_is_legacy (context, legacy_bit);

-      if (epoxy_has_egl_extension (egl_display, "EGL_KHR_swap_buffers_with_damage"))
-        priv->eglSwapBuffersWithDamage = (gpointer)epoxy_eglGetProcAddress ("eglSwapBuffersWithDamageKHR");
-      else if (epoxy_has_egl_extension (egl_display, "EGL_EXT_swap_buffers_with_damage"))
-        priv->eglSwapBuffersWithDamage = (gpointer)epoxy_eglGetProcAddress ("eglSwapBuffersWithDamageEXT");
-
      gdk_profiler_end_mark (start_time, "realize GdkWaylandGLContext", NULL);

      return api;
@@ -589,8 +574,8 @@ gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
  glViewport (0, 0, ww, wh);

 #ifdef HAVE_EGL
-  if (priv->egl_context && gdk_gl_context_check_version (context, 0, 0, 3, 0))
-    glDrawBuffers (1, (GLenum[1]) { gdk_gl_context_get_use_es (context) ? GL_BACK : GL_BACK_LEFT });
+  if (priv->egl_context)
+    glDrawBuffers (1, (GLenum[1]) { GL_BACK_LEFT });
 #endif
 }

@@ -614,7 +599,7 @@ gdk_gl_context_real_end_frame (GdkDrawContext *draw_context,

  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "EGL", "swap buffers");

-  if (priv->eglSwapBuffersWithDamage)
+  if (display->have_egl_swap_buffers_with_damage)
    {
      EGLint stack_rects[4 * 4]; /* 4 rects */
      EGLint *heap_rects = NULL;
@@ -638,7 +623,7 @@ gdk_gl_context_real_end_frame (GdkDrawContext *draw_context,
          rects[j++] = rect.width * scale;
          rects[j++] = rect.height * scale;
        }
-      priv->eglSwapBuffersWithDamage (gdk_display_get_egl_display (display), egl_surface, rects, n_rects);
+      eglSwapBuffersWithDamageEXT (gdk_display_get_egl_display (display), egl_surface, rects, n_rects);
      g_free (heap_rects);
    }
  else
@@ -654,12 +639,6 @@ gdk_gl_context_surface_resized (GdkDrawContext *draw_context)
  gdk_gl_context_clear_old_updated_area (context);
 }

-static guint
-gdk_gl_context_real_get_default_framebuffer (GdkGLContext *self)
-{
-  return 0;
-}
-
 static void
 gdk_gl_context_class_init (GdkGLContextClass *klass)
 {
@@ -671,7 +650,6 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
  klass->is_shared = gdk_gl_context_real_is_shared;
  klass->make_current = gdk_gl_context_real_make_current;
  klass->clear_current = gdk_gl_context_real_clear_current;
-  klass->get_default_framebuffer = gdk_gl_context_real_get_default_framebuffer;

  draw_context_class->begin_frame = gdk_gl_context_real_begin_frame;
  draw_context_class->end_frame = gdk_gl_context_real_end_frame;
@@ -1019,33 +997,16 @@ gdk_gl_context_set_required_version (GdkGLContext *context,
 }

 gboolean
-gdk_gl_context_check_version (GdkGLContext *self,
-                              int           required_gl_major,
-                              int           required_gl_minor,
-                              int           required_gles_major,
-                              int           required_gles_minor)
+gdk_gl_context_check_version (GdkGLContext *context,
+                              int           required_major,
+                              int           required_minor)
 {
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);

-  g_return_val_if_fail (GDK_IS_GL_CONTEXT (self), FALSE);
-  g_return_val_if_fail (required_gl_minor < 10, FALSE);
-  g_return_val_if_fail (required_gles_minor < 10, FALSE);
+  g_return_val_if_fail (GDK_IS_GL_CONTEXT (context), FALSE);
+  g_return_val_if_fail (required_minor < 10, FALSE);

-  if (!gdk_gl_context_is_realized (self))
-    return FALSE;
-
-  switch (priv->api)
-    {
-    case GDK_GL_API_GL:
-      return priv->gl_version >= required_gl_major * 10 + required_gl_minor;
-
-    case GDK_GL_API_GLES:
-      return priv->gl_version >= required_gles_major * 10 + required_gles_minor;
-
-    default:
-      g_return_val_if_reached (FALSE);
-
-    }
+  return priv->gl_version >= required_major * 10 + required_minor;
 }

 /**
@@ -1065,29 +1026,26 @@ gdk_gl_context_get_required_version (GdkGLContext *context,
 {
  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
  gboolean force_gles = FALSE;
+#ifdef G_ENABLE_DEBUG
  GdkDisplay *display;
+#endif
  int default_major, default_minor;
  int maj, min;

  g_return_if_fail (GDK_IS_GL_CONTEXT (context));

-  display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
-
 #ifdef G_ENABLE_DEBUG
+  display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
  force_gles = GDK_DISPLAY_DEBUG_CHECK (display, GL_GLES);
 #endif

-  /* libANGLE on Windows at least requires GLES 3.0+ */
-  if (display->have_egl_win32_libangle)
-    force_gles = TRUE;
-
  /* Default fallback values for uninitialised contexts; we
   * enforce a context version number of 3.2 for desktop GL,
   * and 2.0 for GLES
   */
  if (gdk_gl_context_get_use_es (context) || force_gles)
    {
-      default_major = display->have_egl_win32_libangle ? 3 : 2;
+      default_major = 2;
      default_minor = 0;
    }
  else
@@ -1365,7 +1323,6 @@ gl_debug_message_callback (GLenum        source,
  const char *message_source;
  const char *message_type;
  const char *message_severity;
-  GLogLevelFlags log_level;

  if (severity == GL_DEBUG_SEVERITY_NOTIFICATION)
    return;
@@ -1427,31 +1384,22 @@ gl_debug_message_callback (GLenum        source,
    {
    case GL_DEBUG_SEVERITY_HIGH:
      message_severity = "High";
-      log_level = G_LOG_LEVEL_CRITICAL;
      break;
    case GL_DEBUG_SEVERITY_MEDIUM:
      message_severity = "Medium";
-      log_level = G_LOG_LEVEL_WARNING;
      break;
    case GL_DEBUG_SEVERITY_LOW:
      message_severity = "Low";
-      log_level = G_LOG_LEVEL_MESSAGE;
      break;
    case GL_DEBUG_SEVERITY_NOTIFICATION:
      message_severity = "Notification";
-      log_level = G_LOG_LEVEL_INFO;
      break;
    default:
      message_severity = "Unknown";
-      log_level = G_LOG_LEVEL_MESSAGE;
    }

-  /* There's no higher level function taking a log level argument... */
-  g_log_structured_standard (G_LOG_DOMAIN, log_level,
-                             __FILE__, G_STRINGIFY (__LINE__),
-                             G_STRFUNC,
-                             "OPENGL:\n    Source: %s\n    Type: %s\n    Severity: %s\n    Message: %s",
-                             message_source, message_type, message_severity, message);
+  g_warning ("OPENGL:\n    Source: %s\n    Type: %s\n    Severity: %s\n    Message: %s",
+             message_source, message_type, message_severity, message);
 }

 /**
@@ -1707,31 +1655,6 @@ gdk_gl_context_clear_current (void)
    }
 }

-/*<private>
- * gdk_gl_context_clear_current_if_surface:
- * @surface: surface to clear for
- *
- * Does a gdk_gl_context_clear_current() if the current context is attached
- * to @surface, leaves the current context alone otherwise.
- **/
-void
-gdk_gl_context_clear_current_if_surface (GdkSurface *surface)
-{
-  MaskedContext *current;
-
-  current = g_private_get (&thread_current_context);
-  if (current != NULL && !mask_is_surfaceless (current))
-    {
-      GdkGLContext *context = unmask_context (current);
-
-      if (gdk_gl_context_get_surface (context) != surface)
-        return;
-
-      if (GDK_GL_CONTEXT_GET_CLASS (context)->clear_current (context))
-        g_private_replace (&thread_current_context, NULL);
-    }
-}
-
 /**
 * gdk_gl_context_get_current:
 *
@@ -71,8 +71,6 @@ struct _GdkGLContextClass

  gboolean              (* is_shared)                           (GdkGLContext          *self,
                                                                 GdkGLContext          *other);
-
-  guint                 (* get_default_framebuffer)             (GdkGLContext          *self);
 };

 typedef struct {
@@ -101,8 +99,6 @@ gboolean                gdk_gl_backend_can_be_used              (GdkGLBackend
                                                                 GError         **error);
 void                    gdk_gl_backend_use                      (GdkGLBackend     backend_type);

-void                    gdk_gl_context_clear_current_if_surface (GdkSurface      *surface);
-
 GdkGLContext *          gdk_gl_context_new                      (GdkDisplay      *display,
                                                                 GdkSurface      *surface);

@@ -113,10 +109,8 @@ void                    gdk_gl_context_set_is_legacy            (GdkGLContext
                                                                 gboolean         is_legacy);

 gboolean                gdk_gl_context_check_version            (GdkGLContext    *context,
-                                                                 int              required_gl_major,
-                                                                 int              required_gl_minor,
-                                                                 int              required_gles_major,
-                                                                 int              required_gles_minor);
+                                                                 int              required_major,
+                                                                 int              required_minor);

 gboolean                gdk_gl_context_has_unpack_subimage      (GdkGLContext    *context);
 void                    gdk_gl_context_push_debug_group         (GdkGLContext    *context,
@@ -21,7 +21,6 @@
 #include "gdkgltextureprivate.h"

 #include "gdkdisplayprivate.h"
-#include "gdkglcontextprivate.h"
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdktextureprivate.h"
@@ -175,19 +174,10 @@ gdk_gl_texture_do_download (gpointer texture_,
      glGenFramebuffers (1, &fbo);
      glBindFramebuffer (GL_FRAMEBUFFER, fbo);
      glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->id, 0);
-      if (gdk_gl_context_check_version (self->context, 4, 3, 3, 1))
-        {
-          glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_read_format);
-          glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_read_type);
-          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (self->context), gl_read_format, gl_read_type, &actual_format))
-            actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
-        }
-      else
-        {
-          gl_read_format = GL_RGBA;
-          gl_read_type = GL_UNSIGNED_BYTE;
-          actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
-        }
+      glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_read_format);
+      glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_read_type);
+      if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (self->context), gl_read_format, gl_read_type, &actual_format))
+        actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */

      if (download->format == actual_format &&
          (download->stride == expected_stride))
@@ -315,11 +305,9 @@ gdk_gl_texture_determine_format (GdkGLTexture *self)
  GLint active_texture;
  GLint internal_format;

-  /* Abort if somebody else is GL-ing here... */
-  if (self->context != gdk_gl_context_get_current () ||
-      /* ... or glGetTexLevelParameter() isn't supported */
-      !gdk_gl_context_check_version (self->context, 0, 0, 3, 1))
+  if (self->context != gdk_gl_context_get_current ())
    {
+      /* Somebody else is GL-ing here, abort! */
      texture->format = GDK_MEMORY_DEFAULT;
      return;
    }
@@ -365,42 +353,6 @@ gdk_gl_texture_determine_format (GdkGLTexture *self)
      texture->format = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
      break;

-    case GL_RGBA:
-      {
-        GLint red_size = 0;
-        GLint green_size = 0;
-        GLint blue_size = 0;
-        GLint alpha_size = 0;
-        GLint red_type = 0;
-        GLint green_type = 0;
-        GLint blue_type = 0;
-        GLint alpha_type = 0;
-
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_RED_TYPE, &red_type);
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_GREEN_TYPE, &green_type);
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_BLUE_TYPE, &blue_type);
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_ALPHA_TYPE, &alpha_type);
-
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_RED_SIZE, &red_size);
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_GREEN_SIZE, &green_size);
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_BLUE_SIZE, &blue_size);
-        glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_ALPHA_SIZE, &alpha_size);
-
-#define CHECK_RGBA(rt,gt,bt,at,rs,gs,bs,as) \
-        (red_type == rt && green_type == gt && blue_type == bt && alpha_type == at && \
-         red_size == rs && green_size == gs && blue_size == bs && alpha_size == as)
-
-        if (CHECK_RGBA (GL_UNSIGNED_NORMALIZED, GL_UNSIGNED_NORMALIZED, GL_UNSIGNED_NORMALIZED, GL_UNSIGNED_NORMALIZED, 8, 8, 8, 8))
-          {
-            texture->format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
-            break;
-          }
-
-#undef CHECK_RGBA
-      }
-
-      G_GNUC_FALLTHROUGH;
-
    default:
      g_warning ("Texture in unexpected format 0x%X (%d). File a bug about adding it to GTK", internal_format, internal_format);
      /* fallback to the dumbest possible format
@@ -428,8 +380,7 @@ gdk_gl_texture_determine_format (GdkGLTexture *self)
 * which will happen when the GdkTexture object is finalized, or due to
 * an explicit call of [method@Gdk.GLTexture.release].
 *
- * Return value: (transfer full) (type GdkGLTexture): A newly-created
- *   `GdkTexture`
+ * Return value: (transfer full): A newly-created `GdkTexture`
 */
 GdkTexture *
 gdk_gl_texture_new (GdkGLContext   *context,
@@ -19,7 +19,7 @@
 * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
 * file for a list of people on the GTK+ Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
 */

 #ifndef __GDKINTL_H__
@@ -27,6 +27,10 @@

 #include <glib/gi18n-lib.h>

-#define P_(String) dgettext (GETTEXT_PACKAGE "-properties", String)
+#ifdef ENABLE_NLS
+#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String)
+#else
+#define P_(String) (String)
+#endif

 #endif
@@ -1,16 +1,16 @@
 #!/usr/bin/env perl

-# Updates https://gitlab.gnome.org/GNOME/gtk/tree/main/gdk/gdkkeysyms.h from upstream (X.org 7.x),
+# Updates https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms.h from upstream (X.org 7.x),
 # from https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
-#
+# 
 # Author  : Simos Xenitellis <simos at gnome dot org>.
 # Author  : Bastien Nocera <hadess@hadess.net>
 # Version : 1.2
 #
 # Input   : https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
 # Input   : https://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h
-# Output  : https://gitlab.gnome.org/GNOME/gtk/tree/main/gdk/gdkkeysyms.h
-#
+# Output  : https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms.h
+# 
 # Notes   : It downloads keysymdef.h from the Internet, if not found locally,
 # Notes   : and creates an updated gdkkeysyms.h
 # Notes   : This version updates the source of gdkkeysyms.h from CVS to the GIT server.
@@ -24,7 +24,7 @@ if ( ! -f "keysymdef.h" )
 {
 	print "Trying to download keysymdef.h from\n";
 	print "http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\n";
-	die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\n"
+	die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\n" 
 		unless system("wget -c -O keysymdef.h \"http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h\"") == 0;
 	print " done.\n\n";
 }
@@ -39,7 +39,7 @@ if ( ! -f "XF86keysym.h" )
 {
 	print "Trying to download XF86keysym.h from\n";
 	print "http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\n";
-	die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\n"
+	die "Unable to download keysymdef.h from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\n" 
 		unless system("wget -c -O XF86keysym.h \"http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h\"") == 0;
 	print " done.\n\n";
 }
@@ -82,7 +82,7 @@ print OUT_GDKKEYSYMS $LICENSE_HEADER;
 print OUT_GDKKEYSYMS<<EOF;

 /*
- * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/main/gdk/gdkkeysyms-update.pl
+ * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms-update.pl
 * using the input file
 * http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
 * and
@@ -111,7 +111,7 @@ while (<IN_KEYSYMDEF>)

 	$_ = $keysymelements[1];
 	die "Internal error, was expecting \"XC_*\", found: $_\n" if ( ! /^XK_/ );
-
+	
 	$_ = $keysymelements[2];
 	die "Internal error, was expecting \"0x*\", found: $_\n" if ( ! /^0x/ );

@@ -18,7 +18,7 @@


 /*
- * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/main/gdk/gdkkeysyms-update.pl
+ * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms-update.pl
 * using the input file
 * http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
 * and
@@ -369,7 +369,7 @@ static const struct {
  { 0x07a2, 0x0388 }, /*         Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */
  { 0x07a3, 0x0389 }, /*             Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */
  { 0x07a4, 0x038a }, /*            Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */
-  { 0x07a5, 0x03aa }, /*         Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
+  { 0x07a5, 0x03aa }, /*          Greek_IOTAdieresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
  { 0x07a7, 0x038c }, /*         Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */
  { 0x07a8, 0x038e }, /*         Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */
  { 0x07a9, 0x03ab }, /*       Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
@@ -436,22 +436,22 @@ static const struct {
  { 0x07f7, 0x03c7 }, /*                   Greek_chi χ GREEK SMALL LETTER CHI */
  { 0x07f8, 0x03c8 }, /*                   Greek_psi ψ GREEK SMALL LETTER PSI */
  { 0x07f9, 0x03c9 }, /*                 Greek_omega ω GREEK SMALL LETTER OMEGA */
-  { 0x08a1, 0x23b7 }, /*                 leftradical ⎷ ??? */
-  { 0x08a2, 0x250c }, /*              topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
-  { 0x08a3, 0x2500 }, /*              horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */
+/*  0x08a1                               leftradical ? ??? */
+/*  0x08a2                            topleftradical ? ??? */
+/*  0x08a3                            horizconnector ? ??? */
  { 0x08a4, 0x2320 }, /*                 topintegral ⌠ TOP HALF INTEGRAL */
  { 0x08a5, 0x2321 }, /*                 botintegral ⌡ BOTTOM HALF INTEGRAL */
  { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
-  { 0x08a7, 0x23a1 }, /*            topleftsqbracket ⎡ ??? */
-  { 0x08a8, 0x23a3 }, /*            botleftsqbracket ⎣ ??? */
-  { 0x08a9, 0x23a4 }, /*           toprightsqbracket ⎤ ??? */
-  { 0x08aa, 0x23a6 }, /*           botrightsqbracket ⎦ ??? */
-  { 0x08ab, 0x239b }, /*               topleftparens ⎛ ??? */
-  { 0x08ac, 0x239d }, /*               botleftparens ⎝ ??? */
-  { 0x08ad, 0x239e }, /*              toprightparens ⎞ ??? */
-  { 0x08ae, 0x23a0 }, /*              botrightparens ⎠ ??? */
-  { 0x08af, 0x23a8 }, /*        leftmiddlecurlybrace ⎨ ??? */
-  { 0x08b0, 0x23ac }, /*       rightmiddlecurlybrace ⎬ ??? */
+/*  0x08a7                          topleftsqbracket ? ??? */
+/*  0x08a8                          botleftsqbracket ? ??? */
+/*  0x08a9                         toprightsqbracket ? ??? */
+/*  0x08aa                         botrightsqbracket ? ??? */
+/*  0x08ab                             topleftparens ? ??? */
+/*  0x08ac                             botleftparens ? ??? */
+/*  0x08ad                            toprightparens ? ??? */
+/*  0x08ae                            botrightparens ? ??? */
+/*  0x08af                      leftmiddlecurlybrace ? ??? */
+/*  0x08b0                     rightmiddlecurlybrace ? ??? */
 /*  0x08b1                          topleftsummation ? ??? */
 /*  0x08b2                          botleftsummation ? ??? */
 /*  0x08b3                 topvertsummationconnector ? ??? */
@@ -467,8 +467,8 @@ static const struct {
  { 0x08c1, 0x221d }, /*                   variation ∝ PROPORTIONAL TO */
  { 0x08c2, 0x221e }, /*                    infinity ∞ INFINITY */
  { 0x08c5, 0x2207 }, /*                       nabla ∇ NABLA */
-  { 0x08c8, 0x223c }, /*                 approximate ∼ TILDE OPERATOR */
-  { 0x08c9, 0x2243 }, /*                similarequal ≃ ASYMPTOTICALLY EQUAL TO */
+  { 0x08c8, 0x2245 }, /*                 approximate ≅ APPROXIMATELY EQUAL TO */
+/*  0x08c9                              similarequal ? ??? */
  { 0x08cd, 0x21d4 }, /*                    ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */
  { 0x08ce, 0x21d2 }, /*                     implies ⇒ RIGHTWARDS DOUBLE ARROW */
  { 0x08cf, 0x2261 }, /*                   identical ≡ IDENTICAL TO */
@@ -485,7 +485,7 @@ static const struct {
  { 0x08fc, 0x2191 }, /*                     uparrow ↑ UPWARDS ARROW */
  { 0x08fd, 0x2192 }, /*                  rightarrow → RIGHTWARDS ARROW */
  { 0x08fe, 0x2193 }, /*                   downarrow ↓ DOWNWARDS ARROW */
-/*  0x09df                                     blank ? ??? */
+  { 0x09df, 0x2422 }, /*                       blank ␢ BLANK SYMBOL */
  { 0x09e0, 0x25c6 }, /*                soliddiamond ◆ BLACK DIAMOND */
  { 0x09e1, 0x2592 }, /*                checkerboard ▒ MEDIUM SHADE */
  { 0x09e2, 0x2409 }, /*                          ht ␉ SYMBOL FOR HORIZONTAL TABULATION */
@@ -499,11 +499,11 @@ static const struct {
  { 0x09ec, 0x250c }, /*                upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */
  { 0x09ed, 0x2514 }, /*               lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */
  { 0x09ee, 0x253c }, /*               crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
-  { 0x09ef, 0x23ba }, /*              horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */
-  { 0x09f0, 0x23bb }, /*              horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */
+/*  0x09ef                            horizlinescan1 ? ??? */
+/*  0x09f0                            horizlinescan3 ? ??? */
  { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
-  { 0x09f2, 0x23bc }, /*              horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */
-  { 0x09f3, 0x23bd }, /*              horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */
+/*  0x09f2                            horizlinescan7 ? ??? */
+/*  0x09f3                            horizlinescan9 ? ??? */
  { 0x09f4, 0x251c }, /*                       leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
  { 0x09f5, 0x2524 }, /*                      rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */
  { 0x09f6, 0x2534 }, /*                        bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */
@@ -519,9 +519,9 @@ static const struct {
  { 0x0aa8, 0x200a }, /*                   hairspace   HAIR SPACE */
  { 0x0aa9, 0x2014 }, /*                      emdash — EM DASH */
  { 0x0aaa, 0x2013 }, /*                      endash – EN DASH */
-  { 0x0aac, 0x2423 }, /*                 signifblank ␣ OPEN BOX */
+/*  0x0aac                               signifblank ? ??? */
  { 0x0aae, 0x2026 }, /*                    ellipsis … HORIZONTAL ELLIPSIS */
-  { 0x0aaf, 0x2025 }, /*             doubbaselinedot ‥ TWO DOT LEADER */
+/*  0x0aaf                           doubbaselinedot ? ??? */
  { 0x0ab0, 0x2153 }, /*                    onethird ⅓ VULGAR FRACTION ONE THIRD */
  { 0x0ab1, 0x2154 }, /*                   twothirds ⅔ VULGAR FRACTION TWO THIRDS */
  { 0x0ab2, 0x2155 }, /*                    onefifth ⅕ VULGAR FRACTION ONE FIFTH */
@@ -532,9 +532,9 @@ static const struct {
  { 0x0ab7, 0x215a }, /*                  fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */
  { 0x0ab8, 0x2105 }, /*                      careof ℅ CARE OF */
  { 0x0abb, 0x2012 }, /*                     figdash ‒ FIGURE DASH */
-  { 0x0abc, 0x27e8 }, /*            leftanglebracket ⟨ MATHEMATICAL LEFT ANGLE BRACKET */
+  { 0x0abc, 0x2329 }, /*            leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */
  { 0x0abd, 0x002e }, /*                decimalpoint . FULL STOP */
-  { 0x0abe, 0x27e9 }, /*           rightanglebracket ⟩ MATHEMATICAL RIGHT ANGLE BRACKET */
+  { 0x0abe, 0x232a }, /*           rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */
 /*  0x0abf                                    marker ? ??? */
  { 0x0ac3, 0x215b }, /*                   oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */
  { 0x0ac4, 0x215c }, /*                threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */
@@ -546,13 +546,12 @@ static const struct {
  { 0x0acc, 0x25c1 }, /*            leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */
  { 0x0acd, 0x25b7 }, /*           rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */
  { 0x0ace, 0x25cb }, /*                emopencircle ○ WHITE CIRCLE */
-  { 0x0acf, 0x25af }, /*             emopenrectangle ▯ WHITE VERTICAL RECTANGLE */
+  { 0x0acf, 0x25a1 }, /*             emopenrectangle □ WHITE SQUARE */
  { 0x0ad0, 0x2018 }, /*         leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */
  { 0x0ad1, 0x2019 }, /*        rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */
  { 0x0ad2, 0x201c }, /*         leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */
  { 0x0ad3, 0x201d }, /*        rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */
  { 0x0ad4, 0x211e }, /*                prescription ℞ PRESCRIPTION TAKE */
-  { 0x0ad5, 0x2030 }, /*                    permille ‰ PER MILLE SIGN */
  { 0x0ad6, 0x2032 }, /*                     minutes ′ PRIME */
  { 0x0ad7, 0x2033 }, /*                     seconds ″ DOUBLE PRIME */
  { 0x0ad9, 0x271d }, /*                  latincross ✝ LATIN CROSS */
@@ -561,7 +560,7 @@ static const struct {
  { 0x0adc, 0x25c0 }, /*         filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */
  { 0x0add, 0x25b6 }, /*        filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */
  { 0x0ade, 0x25cf }, /*              emfilledcircle ● BLACK CIRCLE */
-  { 0x0adf, 0x25ae }, /*                emfilledrect ▮ BLACK VERTICAL RECTANGLE */
+  { 0x0adf, 0x25a0 }, /*                emfilledrect ■ BLACK SQUARE */
  { 0x0ae0, 0x25e6 }, /*            enopencircbullet ◦ WHITE BULLET */
  { 0x0ae1, 0x25ab }, /*          enopensquarebullet ▫ WHITE SMALL SQUARE */
  { 0x0ae2, 0x25ad }, /*              openrectbullet ▭ WHITE RECTANGLE */
@@ -806,16 +805,15 @@ static const struct {
  { 0x0ef0, 0x3171 }, /*    Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */
  { 0x0ef1, 0x3178 }, /*    Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */
  { 0x0ef2, 0x317f }, /*              Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */
-  { 0x0ef3, 0x3181 }, /*    Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */
+/*  0x0ef3                  Hangul_KkogjiDalrinIeung ? ??? */
  { 0x0ef4, 0x3184 }, /*   Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
  { 0x0ef5, 0x3186 }, /*          Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
  { 0x0ef6, 0x318d }, /*                Hangul_AraeA ㆍ HANGUL LETTER ARAEA */
  { 0x0ef7, 0x318e }, /*               Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */
  { 0x0ef8, 0x11eb }, /*            Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
-  { 0x0ef9, 0x11f0 }, /*  Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */
+/*  0x0ef9                Hangul_J_KkogjiDalrinIeung ? ??? */
  { 0x0efa, 0x11f9 }, /*        Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
  { 0x0eff, 0x20a9 }, /*                  Korean_Won ₩ WON SIGN */
-  { 0x13a4, 0x20ac }, /*                        Euro € EURO SIGN */
  { 0x13bc, 0x0152 }, /*                          OE Œ LATIN CAPITAL LIGATURE OE */
  { 0x13bd, 0x0153 }, /*                          oe œ LATIN SMALL LIGATURE OE */
  { 0x13be, 0x0178 }, /*                  Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */
@@ -837,13 +835,18 @@ static const struct {
  /* Following items added to GTK, not in the xterm table */

  /* A few ASCII control characters */
-
+#ifndef GDK_WINDOWING_WIN32
  { 0xFF08 /* Backspace */, '\b' },
  { 0xFF09 /* Tab       */, '\t'  },
+#endif
+
  { 0xFF0A /* Linefeed  */, '\n' },
  { 0xFF0B /* Vert. Tab */, '\v' },
+
+#ifndef GDK_WINDOWING_WIN32
  { 0xFF0D /* Return    */, '\r' },
  { 0xFF1B /* Escape    */, '\033' },
+#endif

  /* Numeric keypad */

@@ -868,7 +871,9 @@ static const struct {

  /* End numeric keypad */

+#ifndef GDK_WINDOWING_WIN32
  { 0xFFFF /* Delete */, '\177' }
+#endif
 };

 /**
@@ -1079,7 +1084,7 @@ static const struct {
  { 0x07d7, 0x03a7 }, /*                   Greek_CHI Χ GREEK CAPITAL LETTER CHI */
  { 0x07d8, 0x03a8 }, /*                   Greek_PSI Ψ GREEK CAPITAL LETTER PSI */
  { 0x07d9, 0x03a9 }, /*                 Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */
-  { 0x07a5, 0x03aa }, /*         Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
+  { 0x07a5, 0x03aa }, /*          Greek_IOTAdieresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
  { 0x07a9, 0x03ab }, /*       Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
  { 0x07b1, 0x03ac }, /*           Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */
  { 0x07b2, 0x03ad }, /*         Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */
@@ -1394,7 +1399,6 @@ static const struct {
  { 0x0eed, 0x11c1 }, /*             Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */
  { 0x0eee, 0x11c2 }, /*              Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */
  { 0x0ef8, 0x11eb }, /*            Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */
-  { 0x0ef9, 0x11f0 }, /*  Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */
  { 0x0efa, 0x11f9 }, /*        Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */
  { 0x0aa2, 0x2002 }, /*                     enspace   EN SPACE */
  { 0x0aa1, 0x2003 }, /*                     emspace   EM SPACE */
@@ -1418,9 +1422,7 @@ static const struct {
  { 0x0af1, 0x2020 }, /*                      dagger † DAGGER */
  { 0x0af2, 0x2021 }, /*                doubledagger ‡ DOUBLE DAGGER */
  { 0x0ae6, 0x2022 }, /*          enfilledcircbullet • BULLET */
-  { 0x0aaf, 0x2025 }, /*             doubbaselinedot ‥ TWO DOT LEADER */
  { 0x0aae, 0x2026 }, /*                    ellipsis … HORIZONTAL ELLIPSIS */
-  { 0x0ad5, 0x2030 }, /*                    permille ‰ PER MILLE SIGN */
  { 0x0ad6, 0x2032 }, /*                     minutes ′ PRIME */
  { 0x0ad7, 0x2033 }, /*                     seconds ″ DOUBLE PRIME */
  { 0x0afc, 0x2038 }, /*                       caret ‸ CARET */
@@ -1478,8 +1480,7 @@ static const struct {
  { 0x0bd6, 0x222a }, /*                    downshoe ∪ UNION */
  { 0x08bf, 0x222b }, /*                    integral ∫ INTEGRAL */
  { 0x08c0, 0x2234 }, /*                   therefore ∴ THEREFORE */
-  { 0x08c8, 0x223c }, /*                 approximate ∼ TILDE OPERATOR */
-  { 0x08c9, 0x2243 }, /*                similarequal ≃ ASYMPTOTICALLY EQUAL TO */
+  { 0x08c8, 0x2245 }, /*                 approximate ≅ APPROXIMATELY EQUAL TO */
  { 0x08bd, 0x2260 }, /*                    notequal ≠ NOT EQUAL TO */
  { 0x08cf, 0x2261 }, /*                   identical ≡ IDENTICAL TO */
  { 0x08bc, 0x2264 }, /*               lessthanequal ≤ LESS-THAN OR EQUAL TO */
@@ -1497,28 +1498,15 @@ static const struct {
  { 0x0afa, 0x2315 }, /*           telephonerecorder ⌕ TELEPHONE RECORDER */
  { 0x08a4, 0x2320 }, /*                 topintegral ⌠ TOP HALF INTEGRAL */
  { 0x08a5, 0x2321 }, /*                 botintegral ⌡ BOTTOM HALF INTEGRAL */
+  { 0x0abc, 0x2329 }, /*            leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */
+  { 0x0abe, 0x232a }, /*           rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */
  { 0x0bcc, 0x2395 }, /*                        quad ⎕ APL FUNCTIONAL SYMBOL QUAD (Unicode 3.0) */
-  { 0x08a7, 0x23a1 }, /*            topleftsqbracket ⎡ ??? */
-  { 0x08a8, 0x23a3 }, /*            botleftsqbracket ⎣ ??? */
-  { 0x08a9, 0x23a4 }, /*           toprightsqbracket ⎤ ??? */
-  { 0x08aa, 0x23a6 }, /*           botrightsqbracket ⎦ ??? */
-  { 0x08ab, 0x239b }, /*               topleftparens ⎛ ??? */
-  { 0x08ac, 0x239d }, /*               botleftparens ⎝ ??? */
-  { 0x08ad, 0x239e }, /*              toprightparens ⎞ ??? */
-  { 0x08ae, 0x23a0 }, /*              botrightparens ⎠ ??? */
-  { 0x08af, 0x23a8 }, /*        leftmiddlecurlybrace ⎨ ??? */
-  { 0x08b0, 0x23ac }, /*       rightmiddlecurlybrace ⎬ ??? */
-  { 0x08a1, 0x23b7 }, /*                 leftradical ⎷ ??? */
-  { 0x09ef, 0x23ba }, /*              horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */
-  { 0x09f0, 0x23bb }, /*              horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */
-  { 0x09f2, 0x23bc }, /*              horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */
-  { 0x09f3, 0x23bd }, /*              horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */
  { 0x09e2, 0x2409 }, /*                          ht ␉ SYMBOL FOR HORIZONTAL TABULATION */
  { 0x09e5, 0x240a }, /*                          lf ␊ SYMBOL FOR LINE FEED */
  { 0x09e9, 0x240b }, /*                          vt ␋ SYMBOL FOR VERTICAL TABULATION */
  { 0x09e3, 0x240c }, /*                          ff ␌ SYMBOL FOR FORM FEED */
  { 0x09e4, 0x240d }, /*                          cr ␍ SYMBOL FOR CARRIAGE RETURN */
-  { 0x0aac, 0x2423 }, /*                 signifblank ␣ OPEN BOX */
+  { 0x09df, 0x2422 }, /*                       blank ␢ BLANK SYMBOL */
  { 0x09e8, 0x2424 }, /*                          nl ␤ SYMBOL FOR NEWLINE */
  { 0x09f1, 0x2500 }, /*              horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */
  { 0x08a6, 0x2502 }, /*               vertconnector │ BOX DRAWINGS LIGHT VERTICAL */
@@ -1534,11 +1522,11 @@ static const struct {
  { 0x09ee, 0x253c }, /*               crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
  { 0x09e1, 0x2592 }, /*                checkerboard ▒ MEDIUM SHADE */
  { 0x0adf, 0x25a0 }, /*                emfilledrect ■ BLACK SQUARE */
+  { 0x0acf, 0x25a1 }, /*             emopenrectangle □ WHITE SQUARE */
  { 0x0ae7, 0x25aa }, /*            enfilledsqbullet ▪ BLACK SMALL SQUARE */
  { 0x0ae1, 0x25ab }, /*          enopensquarebullet ▫ WHITE SMALL SQUARE */
  { 0x0adb, 0x25ac }, /*            filledrectbullet ▬ BLACK RECTANGLE */
  { 0x0ae2, 0x25ad }, /*              openrectbullet ▭ WHITE RECTANGLE */
-  { 0x0acf, 0x25af }, /*             emopenrectangle ▯ WHITE VERTICAL RECTANGLE */
  { 0x0ae8, 0x25b2 }, /*           filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */
  { 0x0ae3, 0x25b3 }, /*             opentribulletup △ WHITE UP-POINTING TRIANGLE */
  { 0x0add, 0x25b6 }, /*        filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */
@@ -1568,8 +1556,6 @@ static const struct {
  { 0x0af4, 0x2717 }, /*                 ballotcross ✗ BALLOT X */
  { 0x0ad9, 0x271d }, /*                  latincross ✝ LATIN CROSS */
  { 0x0af0, 0x2720 }, /*                maltesecross ✠ MALTESE CROSS */
-  { 0x0abc, 0x27e8 }, /*            leftanglebracket ⟨ MATHEMATICAL LEFT ANGLE BRACKET */
-  { 0x0abe, 0x27e9 }, /*           rightanglebracket ⟩ MATHEMATICAL RIGHT ANGLE BRACKET */
  { 0x04a4, 0x3001 }, /*                  kana_comma 、 IDEOGRAPHIC COMMA */
  { 0x04a1, 0x3002 }, /*               kana_fullstop 。 IDEOGRAPHIC FULL STOP */
  { 0x04a2, 0x300c }, /*         kana_openingbracket 「 LEFT CORNER BRACKET */
@@ -1688,7 +1674,6 @@ static const struct {
  { 0x0ef0, 0x3171 }, /*    Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */
  { 0x0ef1, 0x3178 }, /*    Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */
  { 0x0ef2, 0x317f }, /*              Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */
-  { 0x0ef3, 0x3181 }, /*    Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */
  { 0x0ef4, 0x3184 }, /*   Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */
  { 0x0ef5, 0x3186 }, /*          Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */
  { 0x0ef6, 0x318d }, /*                Hangul_AraeA ㆍ HANGUL LETTER ARAEA */
@@ -166,54 +166,6 @@ r32g32b32a32_float_from_float (guchar      *dest,
  memcpy (dest, src, sizeof (float) * n * 4);
 }

-#define PREMULTIPLY_FUNC(name, R1, G1, B1, A1, R2, G2, B2, A2) \
-static void \
-name (guchar *dest, \
-      const guchar *src, \
-      gsize n) \
-{ \
-  for (; n > 0; n--) \
-    { \
-      guchar a = src[A1]; \
-      guint16 r = (guint16)src[R1] * a + 127; \
-      guint16 g = (guint16)src[G1] * a + 127; \
-      guint16 b = (guint16)src[B1] * a + 127; \
-      dest[R2] = (r + (r >> 8) + 1) >> 8; \
-      dest[G2] = (g + (g >> 8) + 1) >> 8; \
-      dest[B2] = (b + (b >> 8) + 1) >> 8; \
-      dest[A2] = a; \
-      dest += 4; \
-      src += 4; \
-    } \
-}
-
-PREMULTIPLY_FUNC(r8g8b8a8_to_r8g8b8a8_premultiplied, 0, 1, 2, 3, 0, 1, 2, 3)
-PREMULTIPLY_FUNC(r8g8b8a8_to_b8g8r8a8_premultiplied, 0, 1, 2, 3, 2, 1, 0, 3)
-PREMULTIPLY_FUNC(r8g8b8a8_to_a8r8g8b8_premultiplied, 0, 1, 2, 3, 1, 2, 3, 0)
-PREMULTIPLY_FUNC(r8g8b8a8_to_a8b8g8r8_premultiplied, 0, 1, 2, 3, 3, 2, 1, 0)
-
-#define ADD_ALPHA_FUNC(name, R1, G1, B1, R2, G2, B2, A2) \
-static void \
-name (guchar *dest, \
-      const guchar *src, \
-      gsize n) \
-{ \
-  for (; n > 0; n--) \
-    { \
-      dest[R2] = src[R1]; \
-      dest[G2] = src[G1]; \
-      dest[B2] = src[B1]; \
-      dest[A2] = 255; \
-      dest += 4; \
-      src += 3; \
-    } \
-}
-
-ADD_ALPHA_FUNC(r8g8b8_to_r8g8b8a8, 0, 1, 2, 0, 1, 2, 3)
-ADD_ALPHA_FUNC(r8g8b8_to_b8g8r8a8, 0, 1, 2, 2, 1, 0, 3)
-ADD_ALPHA_FUNC(r8g8b8_to_a8r8g8b8, 0, 1, 2, 1, 2, 3, 0)
-ADD_ALPHA_FUNC(r8g8b8_to_a8b8g8r8, 0, 1, 2, 3, 2, 1, 0)
-
 struct _GdkMemoryFormatDescription
 {
  GdkMemoryAlpha alpha;
@@ -523,59 +475,10 @@ gdk_memory_convert (guchar              *dest_data,
  const GdkMemoryFormatDescription *src_desc = &memory_formats[src_format];
  float *tmp;
  gsize y;
-  void (*func) (guchar *, const guchar *, gsize) = NULL;

  g_assert (dest_format < GDK_MEMORY_N_FORMATS);
  g_assert (src_format < GDK_MEMORY_N_FORMATS);

-  if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    func = r8g8b8a8_to_r8g8b8a8_premultiplied;
-  else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    func = r8g8b8a8_to_b8g8r8a8_premultiplied;
-  else if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    func = r8g8b8a8_to_b8g8r8a8_premultiplied;
-  else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    func = r8g8b8a8_to_r8g8b8a8_premultiplied;
-  else if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    func = r8g8b8a8_to_a8r8g8b8_premultiplied;
-  else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    func = r8g8b8a8_to_a8b8g8r8_premultiplied;
-  else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    func = r8g8b8_to_r8g8b8a8;
-  else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    func = r8g8b8_to_b8g8r8a8;
-  else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    func = r8g8b8_to_b8g8r8a8;
-  else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    func = r8g8b8_to_r8g8b8a8;
-  else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    func = r8g8b8_to_a8r8g8b8;
-  else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    func = r8g8b8_to_a8b8g8r8;
-  else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_R8G8B8A8)
-    func = r8g8b8_to_r8g8b8a8;
-  else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_R8G8B8A8)
-    func = r8g8b8_to_b8g8r8a8;
-  else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_B8G8R8A8)
-    func = r8g8b8_to_b8g8r8a8;
-  else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_B8G8R8A8)
-    func = r8g8b8_to_r8g8b8a8;
-  else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_A8R8G8B8)
-    func = r8g8b8_to_a8r8g8b8;
-  else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_A8R8G8B8)
-    func = r8g8b8_to_a8b8g8r8;
-
-  if (func != NULL)
-    {
-      for (y = 0; y < height; y++)
-        {
-          func (dest_data, src_data, width);
-          src_data += src_stride;
-          dest_data += dest_stride;
-        }
-      return;
-    }
-
  tmp = g_new (float, width * 4);

  for (y = 0; y < height; y++)
@@ -133,10 +133,10 @@ gdk_memory_sanitize (GBytes          *bytes,
 *
 * Creates a new texture for a blob of image data.
 *
- * The `GBytes` must contain @stride × @height pixels
+ * The `GBytes` must contain @stride x @height pixels
 * in the given format.
 *
- * Returns: (type GdkMemoryTexture): A newly-created `GdkTexture`
+ * Returns: A newly-created `GdkTexture`
 */
 GdkTexture *
 gdk_memory_texture_new (int              width,
@@ -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
@@ -52,25 +52,25 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter,

  i = 0;
  while (i < n_ranges)
-    {
+    {  
      int *pixel_ranges = NULL;
      int n_pixel_ranges = 0;
      int j;

      /* Note that get_x_ranges returns layout coordinates
       */
-      if (index_ranges[i*2+1] >= pango_layout_line_get_start_index (line) &&
-	  index_ranges[i*2] < pango_layout_line_get_start_index (line) + pango_layout_line_get_length (line))
+      if (index_ranges[i*2+1] >= line->start_index &&
+	  index_ranges[i*2] < line->start_index + line->length)
 	pango_layout_line_get_x_ranges (line,
 					index_ranges[i*2],
 					index_ranges[i*2+1],
 					&pixel_ranges, &n_pixel_ranges);
-
+  
      for (j = 0; j < n_pixel_ranges; j++)
        {
          GdkRectangle rect;
 	  int x_off, y_off;
-
+          
          x_off = PANGO_PIXELS (pixel_ranges[2*j] - logical_rect.x);
 	  y_off = PANGO_PIXELS (baseline - logical_rect.y);

@@ -124,14 +124,14 @@ gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
 {
  cairo_region_t *clip_region;
  PangoLayoutIter *iter;
-
+  
  g_return_val_if_fail (line != NULL, NULL);
  g_return_val_if_fail (index_ranges != NULL, NULL);
-
+  
  iter = pango_layout_get_iter (line->layout);
  while (pango_layout_iter_get_line_readonly (iter) != line)
    pango_layout_iter_next_line (iter);
-
+  
  clip_region = layout_iter_get_line_clip_region(iter, x_origin, y_origin, index_ranges, n_ranges);

  pango_layout_iter_free (iter);
@@ -167,26 +167,26 @@ gdk_pango_layout_get_clip_region (PangoLayout *layout,
                                  const int   *index_ranges,
                                  int          n_ranges)
 {
-  PangoLayoutIter *iter;
+  PangoLayoutIter *iter;  
  cairo_region_t *clip_region;
-
+  
  g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
  g_return_val_if_fail (index_ranges != NULL, NULL);
-
+  
  clip_region = cairo_region_create ();
-
+  
  iter = pango_layout_get_iter (layout);
-
+  
  do
    {
      PangoRectangle logical_rect;
      cairo_region_t *line_region;
      int baseline;
-
+      
      pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
-      baseline = pango_layout_iter_get_baseline (iter);
+      baseline = pango_layout_iter_get_baseline (iter);      

-      line_region = layout_iter_get_line_clip_region(iter,
+      line_region = layout_iter_get_line_clip_region(iter, 
 						     x_origin + PANGO_PIXELS (logical_rect.x),
 						     y_origin + PANGO_PIXELS (baseline),
 						     index_ranges,
@@ -187,7 +187,7 @@ gdk_popup_get_rect_anchor (GdkPopup *popup)
 *
 * Returns the parent surface of a popup.
 *
- * Returns: (transfer none) (nullable): the parent surface
+ * Returns: (transfer none): the parent surface
 */
 GdkSurface *
 gdk_popup_get_parent (GdkPopup *popup)
@@ -33,7 +33,7 @@
    ((_GDK_RGBA_SELECT_COLOR(str, 0, 0) << 4) | _GDK_RGBA_SELECT_COLOR(str, 0, 1)) / 255., \
    ((_GDK_RGBA_SELECT_COLOR(str, 1, 2) << 4) | _GDK_RGBA_SELECT_COLOR(str, 1, 3)) / 255., \
    ((_GDK_RGBA_SELECT_COLOR(str, 2, 4) << 4) | _GDK_RGBA_SELECT_COLOR(str, 2, 5)) / 255., \
-    ((sizeof(str) % 4 == 1) ? ((_GDK_RGBA_SELECT_COLOR(str, 3, 6) << 4) | _GDK_RGBA_SELECT_COLOR(str, 3, 7)) : 0xFF) / 255. })
+    ((sizeof(str) % 4 == 1) ? ((_GDK_RGBA_SELECT_COLOR(str, 3, 6) << 4) | _GDK_RGBA_SELECT_COLOR(str, 3, 7)) : 0xFF) / 255 })


 gboolean               gdk_rgba_parser_parse                    (GtkCssParser           *parser,
@@ -1095,7 +1095,6 @@ gdk_surface_set_egl_native_window (GdkSurface *self,

  if (priv->egl_surface != NULL)
    {
-      gdk_gl_context_clear_current_if_surface (self);
      eglDestroySurface (gdk_surface_get_display (self), priv->egl_surface);
      priv->egl_surface = NULL;
    }
@@ -1124,8 +1123,7 @@ gdk_surface_ensure_egl_surface (GdkSurface *self,
      priv->egl_surface != NULL &&
      gdk_display_get_egl_config_high_depth (display) != gdk_display_get_egl_config (display))
    {
-      gdk_gl_context_clear_current_if_surface (self);
-      eglDestroySurface (gdk_display_get_egl_display (display), priv->egl_surface);
+      eglDestroySurface (gdk_surface_get_display (self), priv->egl_surface);
      priv->egl_surface = NULL;
    }

@@ -2244,7 +2242,7 @@ _gdk_windowing_got_event (GdkDisplay *display,
                          GdkEvent   *event,
                          gulong      serial)
 {
-  GdkSurface *event_surface = NULL;
+  GdkSurface *event_surface;
  gboolean unlink_event = FALSE;
  GdkDeviceGrabInfo *button_release_grab;
  GdkPointerSurfaceInfo *pointer_info = NULL;
@@ -2336,14 +2334,6 @@ _gdk_windowing_got_event (GdkDisplay *display,
   */
  _gdk_event_queue_handle_motion_compression (display);
  gdk_event_queue_handle_scroll_compression (display);
-
-  if (event_surface)
-    {
-      GdkFrameClock *clock = gdk_surface_get_frame_clock (event_surface);
-
-      if (clock) /* might be NULL if surface was destroyed */
-        gdk_frame_clock_request_phase (clock, GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS);
-    }
 }

 /**
@@ -25,14 +25,14 @@
 * multiple frames, and will be used for a long time.
 *
 * There are various ways to create `GdkTexture` objects from a
- * [class@GdkPixbuf.Pixbuf], or a Cairo surface, or other pixel data.
+ * `GdkPixbuf`, or a Cairo surface, or other pixel data.
 *
 * The ownership of the pixel data is transferred to the `GdkTexture`
 * instance; you can only make a copy of it, via [method@Gdk.Texture.download].
 *
 * `GdkTexture` is an immutable object: That means you cannot change
 * anything about it other than increasing the reference count via
- * [method@GObject.Object.ref], and consequently, it is a thread-safe object.
+ * g_object_ref().
 */

 #include "config.h"
@@ -346,7 +346,7 @@ gdk_texture_init (GdkTexture *self)
 *
 * Creates a new texture object representing the surface.
 *
- * @surface must be an image surface with format `CAIRO_FORMAT_ARGB32`.
+ * @surface must be an image surface with format CAIRO_FORMAT_ARGB32.
 *
 * Returns: a new `GdkTexture`
 */
@@ -384,7 +384,7 @@ gdk_texture_new_for_surface (cairo_surface_t *surface)
 * Creates a new texture object representing the `GdkPixbuf`.
 *
 * This function is threadsafe, so that you can e.g. use GTask
- * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
+ * and g_task_run_in_thread() to avoid blocking the main thread
 * while loading a big image.
 *
 * Returns: a new `GdkTexture`
@@ -430,7 +430,7 @@ gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf)
 * [ctor@Gdk.Texture.new_from_file] to load it.
 *
 * This function is threadsafe, so that you can e.g. use GTask
- * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
+ * and g_task_run_in_thread() to avoid blocking the main thread
 * while loading a big image.
 *
 * Return value: A newly-created `GdkTexture`
@@ -454,7 +454,7 @@ gdk_texture_new_from_resource (const char *resource_path)
    texture = NULL;

  if (texture == NULL)
-    g_error ("Resource path %s is not a valid image: %s", resource_path, error->message);
+    g_error ("Resource path %s s not a valid image: %s", resource_path, error->message);

  return texture;
 }
@@ -472,7 +472,7 @@ gdk_texture_new_from_resource (const char *resource_path)
 * If %NULL is returned, then @error will be set.
 *
 * This function is threadsafe, so that you can e.g. use GTask
- * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
+ * and g_task_run_in_thread() to avoid blocking the main thread
 * while loading a big image.
 *
 * Return value: A newly-created `GdkTexture`
@@ -565,7 +565,7 @@ gdk_texture_new_from_bytes_pixbuf (GBytes  *bytes,
 * If %NULL is returned, then @error will be set.
 *
 * This function is threadsafe, so that you can e.g. use GTask
- * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
+ * and g_task_run_in_thread() to avoid blocking the main thread
 * while loading a big image.
 *
 * Return value: A newly-created `GdkTexture`
@@ -611,7 +611,7 @@ gdk_texture_new_from_bytes (GBytes  *bytes,
 * If %NULL is returned, then @error will be set.
 *
 * This function is threadsafe, so that you can e.g. use GTask
- * and [method@Gio.Task.run_in_thread] to avoid blocking the main thread
+ * and g_task_run_in_thread() to avoid blocking the main thread
 * while loading a big image.
 *
 * Return value: A newly-created `GdkTexture`
@@ -796,7 +796,7 @@ gdk_texture_get_render_data (GdkTexture  *self,
 *
 * This is a utility function intended for debugging and testing.
 * If you want more control over formats, proper error handling or
- * want to store to a [iface@Gio.File] or other location, you might want to
+ * want to store to a `GFile` or other location, you might want to
 * use [method@Gdk.Texture.save_to_png_bytes] or look into the
 * gdk-pixbuf library.
 *
@@ -83,8 +83,6 @@
 *
 * 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))

@@ -93,8 +91,6 @@
 *
 * 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))

@@ -103,21 +99,9 @@
 *
 * 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))
-

 /* evaluates to the current stable version; for development cycles,
 * this means the next stable target, with a hard backstop to the
@@ -259,18 +243,4 @@
 # 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
-
 #endif  /* __GDK_VERSION_MACROS_H__ */
@@ -15,8 +15,6 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stdlib.h>
-
 #include "config.h"

 #include "gdkjpegprivate.h"
@@ -222,7 +222,11 @@ gdk_load_png (GBytes  *bytes,
    case PNG_COLOR_TYPE_RGB_ALPHA:
      if (depth == 8)
        {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
          format = GDK_MEMORY_R8G8B8A8;
+#elif G_BYTE_ORDER == G_BIG_ENDIAN
+          format = GDK_MEMORY_A8B8G8R8;
+#endif
        }
      else
        {
@@ -232,7 +236,11 @@ gdk_load_png (GBytes  *bytes,
    case PNG_COLOR_TYPE_RGB:
      if (depth == 8)
        {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
          format = GDK_MEMORY_R8G8B8;
+#elif G_BYTE_ORDER == G_BIG_ENDIAN
+          format = GDK_MEMORY_B8G8R8;
+#endif
        }
      else if (depth == 16)
        {
@@ -317,14 +325,22 @@ gdk_save_png (GdkTexture *texture)
    case GDK_MEMORY_A8R8G8B8:
    case GDK_MEMORY_R8G8B8A8:
    case GDK_MEMORY_A8B8G8R8:
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
      format = GDK_MEMORY_R8G8B8A8;
+#elif G_BYTE_ORDER == G_BIG_ENDIAN
+      format = GDK_MEMORY_A8B8G8R8;
+#endif
      png_format = PNG_COLOR_TYPE_RGB_ALPHA;
      depth = 8;
      break;

    case GDK_MEMORY_R8G8B8:
    case GDK_MEMORY_B8G8R8:
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
      format = GDK_MEMORY_R8G8B8;
+#elif G_BYTE_ORDER == G_BIG_ENDIAN
+      format = GDK_MEMORY_B8G8R8;
+#endif
      png_format = PNG_COLOR_TYPE_RGB;
      depth = 8;
      break;
@@ -45,6 +45,7 @@

      options = (NSTrackingMouseEnteredAndExited |
                 NSTrackingMouseMoved |
+                 NSTrackingInVisibleRect |
                 NSTrackingActiveAlways);
      trackingArea = [[NSTrackingArea alloc] initWithRect:rect
                                                  options:options
@@ -56,26 +57,9 @@
  return self;
 }

-(void)setInputArea:(const cairo_rectangle_int_t *)area
-{
-  NSRect rect = NSMakeRect (area->x, area->y, area->width, area->height);
-  NSTrackingAreaOptions options;
-
-  [self removeTrackingArea:trackingArea];
-
-  options = (NSTrackingMouseEnteredAndExited |
-             NSTrackingMouseMoved |
-             NSTrackingActiveAlways);
-  trackingArea = [[NSTrackingArea alloc] initWithRect:rect
-                                              options:options
-                                                owner:(id)self
-                                             userInfo:nil];
-  [self addTrackingArea:trackingArea];
-}
-
 -(void)setOpaqueRegion:(cairo_region_t *)region
 {
-  /* Handled in Subclass */
+  /* Do nothing */
 }

 -(BOOL)acceptsFirstMouse
@@ -42,6 +42,5 @@
 -(void)setNeedsInvalidateShadow: (BOOL)invalidate;
 -(NSTrackingArea *)trackingArea;
 -(void)setOpaqueRegion:(cairo_region_t *)region;
-(void)setInputArea:(const cairo_rectangle_int_t *)area;

@end
@@ -0,0 +1,201 @@
+/* GdkMacosCairoSubview.c
+ *
+ * Copyright © 2020 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/>.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include "config.h"
+
+#include <CoreGraphics/CoreGraphics.h>
+#include <cairo-quartz.h>
+
+
+#import "GdkMacosCairoSubview.h"
+#import "GdkMacosCairoView.h"
+
+#include "gdkmacossurface-private.h"
+
+@implementation GdkMacosCairoSubview
+
+-(void)dealloc
+{
+  g_clear_pointer (&self->clip, cairo_region_destroy);
+  [super dealloc];
+}
+
+-(BOOL)isOpaque
+{
+  return _isOpaque;
+}
+
+-(BOOL)isFlipped
+{
+  return YES;
+}
+
+-(GdkSurface *)gdkSurface
+{
+  return GDK_SURFACE ([(GdkMacosBaseView *)[self superview] gdkSurface]);
+}
+
+-(void)drawRect:(NSRect)rect
+{
+  CGContextRef cgContext;
+  GdkSurface *gdk_surface;
+  cairo_surface_t *dest;
+  const NSRect *rects = NULL;
+  NSView *root_view;
+  NSInteger n_rects = 0;
+  NSRect abs_bounds;
+  cairo_t *cr;
+  CGSize scale;
+  int scale_factor;
+
+  if (self->cairoSurface == NULL)
+    return;
+
+  /* Acquire everything we need to do translations, drawing, etc */
+  gdk_surface = [self gdkSurface];
+  scale_factor = gdk_surface_get_scale_factor (gdk_surface);
+  root_view = [[self window] contentView];
+  cgContext = [[NSGraphicsContext currentContext] CGContext];
+  abs_bounds = [self convertRect:[self bounds] toView:root_view];
+
+  CGContextSaveGState (cgContext);
+
+  /* Translate scaling to remove HiDPI scaling from CGContext as
+   * cairo will be doing that for us already.
+   */
+  scale = CGSizeMake (1.0, 1.0);
+  scale = CGContextConvertSizeToDeviceSpace (cgContext, scale);
+  CGContextScaleCTM (cgContext, 1.0 / scale.width, 1.0 / scale.height);
+
+  /* Create the cairo surface to draw to the CGContext and translate
+   * coordinates so we can pretend we are in the same coordinate system
+   * as the GDK surface.
+   */
+  dest = cairo_quartz_surface_create_for_cg_context (cgContext,
+                                                     gdk_surface->width * scale_factor,
+                                                     gdk_surface->height * scale_factor);
+  cairo_surface_set_device_scale (dest, scale_factor, scale_factor);
+
+  /* Create cairo context and translate things into the origin of
+   * the topmost contentView so that we just draw at 0,0 with a
+   * clip region to paint the surface.
+   */
+  cr = cairo_create (dest);
+  cairo_translate (cr, -abs_bounds.origin.x, -abs_bounds.origin.y);
+
+  /* Apply the clip if provided one */
+  if (self->clip != NULL)
+    {
+      cairo_rectangle_int_t area;
+
+      n_rects = cairo_region_num_rectangles (self->clip);
+      for (guint i = 0; i < n_rects; i++)
+        {
+          cairo_region_get_rectangle (self->clip, i, &area);
+          cairo_rectangle (cr, area.x, area.y, area.width, area.height);
+        }
+
+      cairo_clip (cr);
+    }
+
+  /* Clip the cairo context based on the rectangles to be drawn
+   * within the bounding box :rect.
+   */
+  [self getRectsBeingDrawn:&rects count:&n_rects];
+  for (NSInteger i = 0; i < n_rects; i++)
+    {
+      NSRect area = [self convertRect:rects[i] toView:root_view];
+      cairo_rectangle (cr,
+                       area.origin.x, area.origin.y,
+                       area.size.width, area.size.height);
+    }
+  cairo_clip (cr);
+
+  /* Now paint the surface (without blending) as we do not need
+   * any compositing here. The transparent regions (like shadows)
+   * are already on non-opaque layers.
+   */
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+  cairo_set_source_surface (cr, self->cairoSurface, 0, 0);
+  cairo_paint (cr);
+
+  /* Cleanup state, flush the surface to the backing layer, and
+   * restore GState for future use.
+   */
+  cairo_destroy (cr);
+  cairo_surface_flush (dest);
+  cairo_surface_destroy (dest);
+  CGContextRestoreGState (cgContext);
+}
+
+-(void)setCairoSurface:(cairo_surface_t *)surface
+            withDamage:(cairo_region_t *)region
+{
+  if (surface != self->cairoSurface)
+    {
+      g_clear_pointer (&self->cairoSurface, cairo_surface_destroy);
+      if (surface != NULL)
+        self->cairoSurface = cairo_surface_reference (surface);
+    }
+
+  if (region != NULL)
+    {
+      NSView *root_view = [[self window] contentView];
+      NSRect abs_bounds = [self convertRect:[self bounds] toView:root_view];
+      guint n_rects = cairo_region_num_rectangles (region);
+
+      for (guint i = 0; i < n_rects; i++)
+        {
+          cairo_rectangle_int_t rect;
+          NSRect nsrect;
+
+          cairo_region_get_rectangle (region, i, &rect);
+          nsrect = NSMakeRect (rect.x, rect.y, rect.width, rect.height);
+
+          if (NSIntersectsRect (abs_bounds, nsrect))
+            {
+              nsrect.origin.x -= abs_bounds.origin.x;
+              nsrect.origin.y -= abs_bounds.origin.y;
+              [self setNeedsDisplayInRect:nsrect];
+            }
+        }
+    }
+
+  for (id view in [self subviews])
+    [(GdkMacosCairoSubview *)view setCairoSurface:surface
+                                       withDamage:region];
+}
+
+-(void)setOpaque:(BOOL)opaque
+{
+  self->_isOpaque = opaque;
+}
+
+-(void)setClip:(cairo_region_t*)region
+{
+  if (region != self->clip)
+    {
+      g_clear_pointer (&self->clip, cairo_region_destroy);
+      if (region != NULL)
+        self->clip = cairo_region_reference (region);
+    }
+}
+
+@end
@@ -1,6 +1,6 @@
-/* GdkMacosTile.h
+/* GdkMacosCairoSubview.h
 *
- * Copyright © 2022 Red Hat, Inc.
+ * Copyright © 2020 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
@@ -18,20 +18,20 @@
 * SPDX-License-Identifier: LGPL-2.1-or-later
 */

-#include <QuartzCore/QuartzCore.h>
+#include <AppKit/AppKit.h>

-#include "gdkmacosbuffer-private.h"
+#define GDK_IS_MACOS_CAIRO_SUBVIEW(obj) ((obj) && [obj isKindOfClass:[GdkMacosCairoSubview class]])

-#define GDK_IS_MACOS_TILE(obj) ((obj) && [obj isKindOfClass:[GdkMacosTile class]])
-
-@protocol CanSetContentsChanged
-(void)setContentsChanged;
-@end
-
-@interface GdkMacosTile : CALayer
+@interface GdkMacosCairoSubview : NSView
 {
-};
+  BOOL             _isOpaque;
+  cairo_surface_t *cairoSurface;
+  cairo_region_t  *clip;
+}

-(void)swapBuffer:(IOSurfaceRef)buffer withRect:(CGRect)rect;
+-(void)setOpaque:(BOOL)opaque;
+-(void)setCairoSurface:(cairo_surface_t *)cairoSurface
+            withDamage:(cairo_region_t *)region;
+-(void)setClip:(cairo_region_t*)region;

@end
@@ -0,0 +1,187 @@
+/* GdkMacosCairoView.c
+ *
+ * Copyright © 2020 Red Hat, Inc.
+ * Copyright © 2005-2007 Imendio AB
+ *
+ * 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/>.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include "config.h"
+
+#include <CoreGraphics/CoreGraphics.h>
+#include <cairo-quartz.h>
+
+
+#import "GdkMacosCairoView.h"
+#import "GdkMacosCairoSubview.h"
+
+#include "gdkmacossurface-private.h"
+
+@implementation GdkMacosCairoView
+
+-(void)dealloc
+{
+  g_clear_pointer (&self->opaque, g_ptr_array_unref);
+  self->transparent = NULL;
+
+  [super dealloc];
+}
+
+-(BOOL)isOpaque
+{
+  if ([self window])
+    return [[self window] isOpaque];
+  return YES;
+}
+
+-(BOOL)isFlipped
+{
+  return YES;
+}
+
+-(void)setNeedsDisplay:(BOOL)needsDisplay
+{
+  for (id child in [self subviews])
+    [child setNeedsDisplay:needsDisplay];
+}
+
+-(void)setCairoSurface:(cairo_surface_t *)cairoSurface
+            withDamage:(cairo_region_t *)cairoRegion
+{
+  for (id view in [self subviews])
+    [(GdkMacosCairoSubview *)view setCairoSurface:cairoSurface
+                                       withDamage:cairoRegion];
+}
+
+-(void)removeOpaqueChildren
+{
+  [[self->transparent subviews]
+    makeObjectsPerformSelector:@selector(removeFromSuperview)];
+
+  if (self->opaque->len)
+    g_ptr_array_remove_range (self->opaque, 0, self->opaque->len);
+}
+
+-(void)setOpaqueRegion:(cairo_region_t *)region
+{
+  cairo_region_t *transparent_clip;
+  NSRect abs_bounds;
+  guint n_rects;
+
+  if (region == NULL)
+    return;
+
+  abs_bounds = [self convertRect:[self bounds] toView:nil];
+  n_rects = cairo_region_num_rectangles (region);
+
+  /* First, we create a clip region for the transparent region to use so that
+   * we dont end up exposing too much other than the corners on CSD.
+   */
+  transparent_clip = cairo_region_create_rectangle (&(cairo_rectangle_int_t) {
+    abs_bounds.origin.x, abs_bounds.origin.y,
+    abs_bounds.size.width, abs_bounds.size.height
+  });
+  cairo_region_subtract (transparent_clip, region);
+  [(GdkMacosCairoSubview *)self->transparent setClip:transparent_clip];
+  cairo_region_destroy (transparent_clip);
+
+  /* The common case (at least for opaque windows and CSD) is that we will
+   * have either one or two opaque rectangles. If we detect that the same
+   * number of them are available as the previous, we can just resize the
+   * previous ones to avoid adding/removing views at a fast rate while
+   * resizing.
+   */
+  if (n_rects == self->opaque->len)
+    {
+      for (guint i = 0; i < n_rects; i++)
+        {
+          GdkMacosCairoSubview *child;
+          cairo_rectangle_int_t rect;
+
+          child = g_ptr_array_index (self->opaque, i);
+          cairo_region_get_rectangle (region, i, &rect);
+
+          [child setFrame:NSMakeRect (rect.x - abs_bounds.origin.x,
+                                      rect.y - abs_bounds.origin.y,
+                                      rect.width,
+                                      rect.height)];
+        }
+
+      return;
+    }
+
+  [self removeOpaqueChildren];
+  for (guint i = 0; i < n_rects; i++)
+    {
+      GdkMacosCairoSubview *child;
+      cairo_rectangle_int_t rect;
+      NSRect nsrect;
+
+      cairo_region_get_rectangle (region, i, &rect);
+      nsrect = NSMakeRect (rect.x - abs_bounds.origin.x,
+                           rect.y - abs_bounds.origin.y,
+                           rect.width,
+                           rect.height);
+
+      child = [[GdkMacosCairoSubview alloc] initWithFrame:nsrect];
+      [child setOpaque:YES];
+      [child setWantsLayer:YES];
+      [self->transparent addSubview:child];
+      g_ptr_array_add (self->opaque, child);
+    }
+}
+
+-(NSView *)initWithFrame:(NSRect)frame
+{
+  if ((self = [super initWithFrame:frame]))
+    {
+      /* An array to track all the opaque children placed into
+       * the child self->transparent. This allows us to reuse them
+       * when we receive a new opaque area instead of discarding
+       * them on each draw.
+       */
+      self->opaque = g_ptr_array_new ();
+
+      /* Setup our primary subview which will render all content that is not
+       * within an opaque region (such as shadows for CSD windows). For opaque
+       * windows, this will all be obscurred by other views, so it doesn't
+       * matter much to have it here.
+       */
+      self->transparent = [[GdkMacosCairoSubview alloc] initWithFrame:frame];
+      [self addSubview:self->transparent];
+
+    }
+
+  return self;
+}
+
+-(void)setFrame:(NSRect)rect
+{
+  [super setFrame:rect];
+  [self->transparent setFrame:NSMakeRect (0, 0, rect.size.width, rect.size.height)];
+}
+
+-(BOOL)acceptsFirstMouse
+{
+  return YES;
+}
+
+-(BOOL)mouseDownCanMoveWindow
+{
+  return NO;
+}
+
+@end
@@ -1,6 +1,7 @@
-/* GdkMacosView.h
+/* GdkMacosCairoView.h
 *
- * Copyright 2022 Christian Hergert <chergert@redhat.com>
+ * Copyright © 2020 Red Hat, Inc.
+ * Copyright © 2005-2007 Imendio AB
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,17 +23,15 @@

 #import "GdkMacosBaseView.h"

-#include "gdkmacosbuffer-private.h"
+#define GDK_IS_MACOS_CAIRO_VIEW(obj) ((obj) && [obj isKindOfClass:[GdkMacosCairoView class]])

-#define GDK_IS_MACOS_VIEW(obj) ((obj) && [obj isKindOfClass:[GdkMacosView class]])
-
-@interface GdkMacosView : GdkMacosBaseView
+@interface GdkMacosCairoView : GdkMacosBaseView
 {
-  NSRect _nextFrame;
-  guint  _nextFrameDirty : 1;
+  NSView *transparent;
+  GPtrArray *opaque;
 }

-(void)setOpaqueRegion:(const cairo_region_t *)opaqueRegion;
-(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage;
+-(void)setCairoSurface:(cairo_surface_t *)cairoSurface
+            withDamage:(cairo_region_t *)region;

@end
@@ -0,0 +1,125 @@
+/* GdkMacosGLView.c
+ *
+ * Copyright 2020 Christian Hergert <chergert@redhat.com>
+ *
+ * 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/>.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include "config.h"
+
+#include <CoreGraphics/CoreGraphics.h>
+#include <OpenGL/gl.h>
+
+#include "gdkmacossurface-private.h"
+
+#import "GdkMacosGLView.h"
+
+@implementation GdkMacosGLView
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+-(void)lockFocus
+{
+  NSOpenGLContext *context;
+
+  [super lockFocus];
+
+  context = [self openGLContext];
+
+  if ([context view] != self)
+    [context setView: self];
+}
+
+-(void)drawRect:(NSRect)rect
+{
+}
+
+-(void)clearGLContext
+{
+  if (_openGLContext != nil)
+    [_openGLContext clearDrawable];
+
+  _openGLContext = nil;
+}
+
+-(void)setOpenGLContext:(NSOpenGLContext*)context
+{
+  if (_openGLContext != context)
+    {
+      if (_openGLContext != nil)
+        [_openGLContext clearDrawable];
+
+      _openGLContext = context;
+
+      if (_openGLContext != nil)
+        {
+          [_openGLContext setView:self];
+          [self setWantsLayer:YES];
+          [self.layer setContentsGravity:kCAGravityBottomLeft];
+          [_openGLContext update];
+        }
+    }
+}
+
+-(NSOpenGLContext *)openGLContext
+{
+  return _openGLContext;
+}
+
+-(BOOL)isOpaque
+{
+  if ([self window])
+    return [[self window] isOpaque];
+  return YES;
+}
+
+-(BOOL)isFlipped
+{
+  return YES;
+}
+
+-(BOOL)acceptsFirstMouse
+{
+  return YES;
+}
+
+-(BOOL)mouseDownCanMoveWindow
+{
+  return NO;
+}
+
+-(void)invalidateRegion:(const cairo_region_t *)region
+{
+  if (region != NULL)
+    {
+      guint n_rects = cairo_region_num_rectangles (region);
+
+      for (guint i = 0; i < n_rects; i++)
+        {
+          cairo_rectangle_int_t rect;
+          NSRect nsrect;
+
+          cairo_region_get_rectangle (region, i, &rect);
+          nsrect = NSMakeRect (rect.x, rect.y, rect.width, rect.height);
+
+          [self setNeedsDisplayInRect:nsrect];
+        }
+    }
+}
+
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+@end
@@ -1,6 +1,7 @@
-/* GdkMacosTile.c
+/* GdkMacosGLView.h
 *
- * Copyright © 2022 Red Hat, Inc.
+ * Copyright © 2020 Red Hat, Inc.
+ * Copyright © 2005-2007 Imendio AB
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -18,34 +19,23 @@
 * SPDX-License-Identifier: LGPL-2.1-or-later
 */

-#include "config.h"
+#include <cairo.h>

-#include <AppKit/AppKit.h>
+#import "GdkMacosBaseView.h"

-#import "GdkMacosTile.h"
+#define GDK_IS_MACOS_GL_VIEW(obj) ((obj) && [obj isKindOfClass:[GdkMacosGLView class]])

-@implementation GdkMacosTile
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS

-(id)init
+@interface GdkMacosGLView : GdkMacosBaseView
 {
-  self = [super init];
-
-  [self setContentsScale:1.0];
-  [self setEdgeAntialiasingMask:0];
-  [self setDrawsAsynchronously:YES];
-
-  return self;
+  NSOpenGLContext *_openGLContext;
 }

-(void)swapBuffer:(IOSurfaceRef)buffer withRect:(CGRect)rect
-{
-  if G_LIKELY ([self contents] == (id)buffer)
-    [(id<CanSetContentsChanged>)self setContentsChanged];
-  else
-    [self setContents:(id)buffer];
+-(void)setOpenGLContext:(NSOpenGLContext*)context;
+-(NSOpenGLContext *)openGLContext;
+-(void)invalidateRegion:(const cairo_region_t *)region;

-  if G_UNLIKELY (!CGRectEqualToRect ([self contentsRect], rect))
-    self.contentsRect = rect;
-}
+G_GNUC_END_IGNORE_DEPRECATIONS

@end
@@ -1,386 +0,0 @@
-/* GdkMacosLayer.c
- *
- * Copyright © 2022 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/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include "config.h"
-
-#import "GdkMacosLayer.h"
-#import "GdkMacosTile.h"
-
-@protocol CanSetContentsOpaque
- (void)setContentsOpaque:(BOOL)mask;
-@end
-
-@implementation GdkMacosLayer
-
-#define TILE_MAX_SIZE 128
-#define TILE_EDGE_MAX_SIZE 512
-
-static CGAffineTransform flipTransform;
-static gboolean hasFlipTransform;
-
-typedef struct
-{
-  GdkMacosTile          *tile;
-  cairo_rectangle_int_t  cr_area;
-  CGRect                 area;
-  guint                  opaque : 1;
-} TileInfo;
-
-typedef struct
-{
-  const cairo_region_t *region;
-  guint n_rects;
-  guint iter;
-  cairo_rectangle_int_t rect;
-  cairo_rectangle_int_t stash;
-  guint finished : 1;
-} Tiler;
-
-static void
-tiler_init (Tiler                *tiler,
-            const cairo_region_t *region)
-{
-  memset (tiler, 0, sizeof *tiler);
-
-  if (region == NULL)
-    {
-      tiler->finished = TRUE;
-      return;
-    }
-
-  tiler->region = region;
-  tiler->n_rects = cairo_region_num_rectangles (region);
-
-  if (tiler->n_rects > 0)
-    cairo_region_get_rectangle (region, 0, &tiler->rect);
-  else
-    tiler->finished = TRUE;
-}
-
-static gboolean
-tiler_next (Tiler                 *tiler,
-            cairo_rectangle_int_t *tile,
-            int                    max_size)
-{
-  if (tiler->finished)
-    return FALSE;
-
-  if (tiler->rect.width == 0 || tiler->rect.height == 0)
-    {
-      tiler->iter++;
-
-      if (tiler->iter >= tiler->n_rects)
-        {
-          tiler->finished = TRUE;
-          return FALSE;
-        }
-
-      cairo_region_get_rectangle (tiler->region, tiler->iter, &tiler->rect);
-    }
-
-  /* If the next rectangle is too tall, slice the bottom off to
-   * leave just the height we want into tiler->stash.
-   */
-  if (tiler->rect.height > max_size)
-    {
-      tiler->stash = tiler->rect;
-      tiler->stash.y += max_size;
-      tiler->stash.height -= max_size;
-      tiler->rect.height = max_size;
-    }
-
-  /* Now we can take the next horizontal slice */
-  tile->x = tiler->rect.x;
-  tile->y = tiler->rect.y;
-  tile->height = tiler->rect.height;
-  tile->width = MIN (max_size, tiler->rect.width);
-
-  tiler->rect.x += tile->width;
-  tiler->rect.width -= tile->width;
-
-  if (tiler->rect.width == 0)
-    {
-      tiler->rect = tiler->stash;
-      tiler->stash.width = tiler->stash.height = 0;
-    }
-
-  return TRUE;
-}
-
-static inline CGRect
-toCGRect (const cairo_rectangle_int_t *rect)
-{
-  return CGRectMake (rect->x, rect->y, rect->width, rect->height);
-}
-
-static inline cairo_rectangle_int_t
-fromCGRect (const CGRect rect)
-{
-  return (cairo_rectangle_int_t) {
-    rect.origin.x,
-    rect.origin.y,
-    rect.size.width,
-    rect.size.height
-  };
-}
-
-(id)init
-{
-  if (!hasFlipTransform)
-    {
-      hasFlipTransform = TRUE;
-      flipTransform = CGAffineTransformMakeScale (1, -1);
-    }
-
-  self = [super init];
-
-  if (self == NULL)
-    return NULL;
-
-  self->_layoutInvalid = TRUE;
-
-  [self setContentsGravity:kCAGravityCenter];
-  [self setContentsScale:1.0f];
-  [self setGeometryFlipped:YES];
-
-  return self;
-}
-
-(BOOL)isOpaque
-{
-  return NO;
-}
-
-(void)_applyLayout:(GArray *)tiles
-{
-  CGAffineTransform transform;
-  GArray *prev;
-  gboolean exhausted;
-  guint j = 0;
-
-  if (self->_isFlipped)
-    transform = flipTransform;
-  else
-    transform = CGAffineTransformIdentity;
-
-  prev = g_steal_pointer (&self->_tiles);
-  self->_tiles = tiles;
-  exhausted = prev == NULL;
-
-  /* Try to use existing CALayer to avoid creating new layers
-   * as that can be rather expensive.
-   */
-  for (guint i = 0; i < tiles->len; i++)
-    {
-      TileInfo *info = &g_array_index (tiles, TileInfo, i);
-
-      if (!exhausted)
-        {
-          TileInfo *other = NULL;
-
-          for (; j < prev->len; j++)
-            {
-              other = &g_array_index (prev, TileInfo, j);
-
-              if (other->opaque == info->opaque)
-                {
-                  j++;
-                  break;
-                }
-
-              other = NULL;
-            }
-
-          if (other != NULL)
-            {
-              info->tile = g_steal_pointer (&other->tile);
-              [info->tile setFrame:info->area];
-              [info->tile setAffineTransform:transform];
-              continue;
-            }
-        }
-
-      info->tile = [GdkMacosTile layer];
-
-      [info->tile setAffineTransform:transform];
-      [info->tile setContentsScale:1.0f];
-      [info->tile setOpaque:info->opaque];
-      [(id<CanSetContentsOpaque>)info->tile setContentsOpaque:info->opaque];
-      [info->tile setFrame:info->area];
-
-      [self addSublayer:info->tile];
-    }
-
-  /* Release all of our old layers */
-  if (prev != NULL)
-    {
-      for (guint i = 0; i < prev->len; i++)
-        {
-          TileInfo *info = &g_array_index (prev, TileInfo, i);
-
-          if (info->tile != NULL)
-            [info->tile removeFromSuperlayer];
-        }
-
-      g_array_unref (prev);
-    }
-}
-
-(void)layoutSublayers
-{
-  Tiler tiler;
-  GArray *ar;
-  cairo_region_t *transparent;
-  cairo_rectangle_int_t rect;
-  int max_size;
-
-  if (!self->_inSwapBuffer)
-    return;
-
-  self->_layoutInvalid = FALSE;
-
-  ar = g_array_sized_new (FALSE, FALSE, sizeof (TileInfo), 32);
-
-  rect = fromCGRect ([self bounds]);
-  rect.x = rect.y = 0;
-
-  /* Calculate the transparent region (edges usually) */
-  transparent = cairo_region_create_rectangle (&rect);
-  if (self->_opaqueRegion)
-    cairo_region_subtract (transparent, self->_opaqueRegion);
-
-  self->_opaque = cairo_region_is_empty (transparent);
-
-  /* If we have transparent borders around the opaque region, then
-   * we are okay with a bit larger tiles since they don't change
-   * all that much and are generally small in width.
-   */
-  if (!self->_opaque &&
-      self->_opaqueRegion &&
-      !cairo_region_is_empty (self->_opaqueRegion))
-    max_size = TILE_EDGE_MAX_SIZE;
-  else
-    max_size = TILE_MAX_SIZE;
-
-  /* Track transparent children */
-  tiler_init (&tiler, transparent);
-  while (tiler_next (&tiler, &rect, max_size))
-    {
-      TileInfo *info;
-
-      g_array_set_size (ar, ar->len+1);
-
-      info = &g_array_index (ar, TileInfo, ar->len-1);
-      info->tile = NULL;
-      info->opaque = FALSE;
-      info->cr_area = rect;
-      info->area = toCGRect (&info->cr_area);
-    }
-
-  /* Track opaque children */
-  tiler_init (&tiler, self->_opaqueRegion);
-  while (tiler_next (&tiler, &rect, TILE_MAX_SIZE))
-    {
-      TileInfo *info;
-
-      g_array_set_size (ar, ar->len+1);
-
-      info = &g_array_index (ar, TileInfo, ar->len-1);
-      info->tile = NULL;
-      info->opaque = TRUE;
-      info->cr_area = rect;
-      info->area = toCGRect (&info->cr_area);
-    }
-
-  cairo_region_destroy (transparent);
-
-  [self _applyLayout:g_steal_pointer (&ar)];
-  [super layoutSublayers];
-}
-
-(void)setFrame:(NSRect)frame
-{
-  if (frame.size.width != self.bounds.size.width ||
-      frame.size.height != self.bounds.size.height)
-    {
-      self->_layoutInvalid = TRUE;
-      [self setNeedsLayout];
-    }
-
-  [super setFrame:frame];
-}
-
-(void)setOpaqueRegion:(const cairo_region_t *)opaqueRegion
-{
-  g_clear_pointer (&self->_opaqueRegion, cairo_region_destroy);
-  self->_opaqueRegion = cairo_region_copy (opaqueRegion);
-  self->_layoutInvalid = TRUE;
-
-  [self setNeedsLayout];
-}
-
-(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage
-{
-  IOSurfaceRef ioSurface = _gdk_macos_buffer_get_native (buffer);
-  gboolean flipped = _gdk_macos_buffer_get_flipped (buffer);
-  double scale = _gdk_macos_buffer_get_device_scale (buffer);
-  double width = _gdk_macos_buffer_get_width (buffer) / scale;
-  double height = _gdk_macos_buffer_get_height (buffer) / scale;
-
-  if (flipped != self->_isFlipped)
-    {
-      self->_isFlipped = flipped;
-      self->_layoutInvalid = TRUE;
-    }
-
-  if (self->_layoutInvalid)
-    {
-      self->_inSwapBuffer = TRUE;
-      [self layoutSublayers];
-      self->_inSwapBuffer = FALSE;
-    }
-
-  if (self->_tiles == NULL)
-    return;
-
-  for (guint i = 0; i < self->_tiles->len; i++)
-    {
-      const TileInfo *info = &g_array_index (self->_tiles, TileInfo, i);
-      cairo_region_overlap_t overlap;
-      CGRect area;
-
-      overlap = cairo_region_contains_rectangle (damage, &info->cr_area);
-      if (overlap == CAIRO_REGION_OVERLAP_OUT)
-        continue;
-
-      area.origin.x = info->area.origin.x / width;
-      area.size.width = info->area.size.width / width;
-      area.size.height = info->area.size.height / height;
-
-      if (flipped)
-        area.origin.y = (height - info->area.origin.y - info->area.size.height) / height;
-      else
-        area.origin.y = info->area.origin.y / height;
-
-      [info->tile swapBuffer:ioSurface withRect:area];
-    }
-}
-
-@end
@@ -1,44 +0,0 @@
-/* GdkMacosLayer.h
- *
- * Copyright © 2022 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/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include <QuartzCore/QuartzCore.h>
-#include <IOSurface/IOSurface.h>
-
-#include <cairo.h>
-#include <glib.h>
-
-#include "gdkmacosbuffer-private.h"
-
-#define GDK_IS_MACOS_LAYER(obj) ((obj) && [obj isKindOfClass:[GdkMacosLayer class]])
-
-@interface GdkMacosLayer : CALayer
-{
-  cairo_region_t *_opaqueRegion;
-  GArray         *_tiles;
-  guint           _opaque : 1;
-  guint           _layoutInvalid : 1;
-  guint           _inSwapBuffer : 1;
-  guint           _isFlipped : 1;
-};
-
-(void)setOpaqueRegion:(const cairo_region_t *)opaqueRegion;
-(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage;
-
-@end
@@ -1,100 +0,0 @@
-/* GdkMacosView.c
- *
- * Copyright 2022 Christian Hergert <chergert@redhat.com>
- *
- * 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/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include "config.h"
-
-#include <CoreGraphics/CoreGraphics.h>
-
-#import "GdkMacosLayer.h"
-#import "GdkMacosView.h"
-#import "GdkMacosWindow.h"
-
-@implementation GdkMacosView
-
-(id)initWithFrame:(NSRect)frame
-{
-  if ((self = [super initWithFrame:frame]))
-    {
-      GdkMacosLayer *layer = [GdkMacosLayer layer];
-
-      [self setLayerContentsRedrawPolicy:NSViewLayerContentsRedrawNever];
-      [self setLayer:layer];
-      [self setWantsLayer:YES];
-    }
-
-  return self;
-}
-
-(BOOL)isFlipped
-{
-  return YES;
-}
-
-(BOOL)acceptsFirstMouse
-{
-  return YES;
-}
-
-(BOOL)mouseDownCanMoveWindow
-{
-  return NO;
-}
-
-(void)mouseDown:(NSEvent *)nsevent
-{
-  if ([(GdkMacosWindow *)[self window] needsMouseDownQuirk])
-    /* We should only hit this when we are trying to click through
-     * the shadow of a window into another window. Just request
-     * that the application not activate this window on mouseUp.
-     * See gdkmacosdisplay-translate.c for the other half of this.
-     */
-    [NSApp preventWindowOrdering];
-  else
-    [super mouseDown:nsevent];
-}
-
-(void)setFrame:(NSRect)rect
-{
-  [super setFrame:rect];
-  self->_nextFrameDirty = TRUE;
-}
-
-(void)setOpaqueRegion:(const cairo_region_t *)opaqueRegion
-{
-  [(GdkMacosLayer *)[self layer] setOpaqueRegion:opaqueRegion];
-}
-
-(BOOL)wantsUpdateLayer
-{
-  return YES;
-}
-
-(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage
-{
-  if (self->_nextFrameDirty)
-    {
-      self->_nextFrameDirty = FALSE;
-      [[self layer] setFrame:[self frame]];
-    }
-
-  [(GdkMacosLayer *)[self layer] swapBuffer:buffer withDamage:damage];
-}
-
-@end
@@ -24,7 +24,8 @@
 #include <gdk/gdk.h>

 #import "GdkMacosBaseView.h"
-#import "GdkMacosView.h"
+#import "GdkMacosCairoView.h"
+#import "GdkMacosGLView.h"
 #import "GdkMacosWindow.h"

 #include "gdkmacosclipboard-private.h"
@@ -149,7 +150,8 @@ typedef NSString *CALayerContentsGravity;
      _gdk_macos_display_break_all_grabs (GDK_MACOS_DISPLAY (display), time);

      /* Reset gravity */
-      [[[self contentView] layer] setContentsGravity:kCAGravityBottomLeft];
+      if (GDK_IS_MACOS_GL_VIEW ([self contentView]))
+        [[[self contentView] layer] setContentsGravity:kCAGravityBottomLeft];

      break;
    }
@@ -171,11 +173,6 @@ typedef NSString *CALayerContentsGravity;
  return inMove;
 }

- (BOOL)inFullscreenTransition;
-{
-  return inFullscreenTransition;
-}
-
 -(void)checkSendEnterNotify
 {
  /* When a new window has been created, and the mouse is in the window
@@ -206,20 +203,69 @@ typedef NSString *CALayerContentsGravity;
    }
 }

-(void)setFrame:(NSRect)frame display:(BOOL)display
+-(void)windowDidUnmaximize
+{
+  NSWindowStyleMask style_mask = [self styleMask];
+
+  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface), GDK_TOPLEVEL_STATE_MAXIMIZED, 0);
+
+  /* If we are using CSD, then we transitioned to an opaque
+   * window while we were maximized. Now we need to drop that
+   * as we are leaving maximized state.
+   */
+  if ((style_mask & NSWindowStyleMaskTitled) == 0 && [self isOpaque])
+    [self setOpaque:NO];
+}
+
+-(void)windowDidMove:(NSNotification *)aNotification
 {
-  NSRect contentRect = [self contentRectForFrameRect:frame];
  GdkSurface *surface = GDK_SURFACE (gdk_surface);
  gboolean maximized = (surface->state & GDK_TOPLEVEL_STATE_MAXIMIZED) != 0;

-  if (maximized && !inMaximizeTransition && !NSEqualRects (lastMaximizedFrame, frame))
-    {
-      gdk_synthesize_surface_state (surface, GDK_TOPLEVEL_STATE_MAXIMIZED, 0);
-      _gdk_surface_update_size (surface);
-    }
+  /* In case the window is changed when maximized remove the maximized state */
+  if (maximized && !inMaximizeTransition && !NSEqualRects (lastMaximizedFrame, [self frame]))
+    [self windowDidUnmaximize];

-  [super setFrame:frame display:display];
-  [[self contentView] setFrame:NSMakeRect (0, 0, contentRect.size.width, contentRect.size.height)];
+  _gdk_macos_surface_update_position (gdk_surface);
+  _gdk_macos_surface_reposition_children (gdk_surface);
+
+  [self checkSendEnterNotify];
+}
+
+-(void)windowDidResize:(NSNotification *)aNotification
+{
+  NSRect content_rect;
+  GdkSurface *surface;
+  GdkDisplay *display;
+  gboolean maximized;
+
+  surface = GDK_SURFACE (gdk_surface);
+  display = gdk_surface_get_display (surface);
+
+  content_rect = [self contentRectForFrameRect:[self frame]];
+  maximized = (surface->state & GDK_TOPLEVEL_STATE_MAXIMIZED) != 0;
+
+  /* see same in windowDidMove */
+  if (maximized && !inMaximizeTransition && !NSEqualRects (lastMaximizedFrame, [self frame]))
+    [self windowDidUnmaximize];
+
+  surface->width = content_rect.size.width;
+  surface->height = content_rect.size.height;
+
+  /* Certain resize operations (e.g. going fullscreen), also move the
+   * origin of the window.
+   */
+  _gdk_macos_surface_update_position (GDK_MACOS_SURFACE (surface));
+
+  [[self contentView] setFrame:NSMakeRect (0, 0, surface->width, surface->height)];
+
+  _gdk_surface_update_size (surface);
+
+  gdk_surface_request_layout (surface);
+
+  _gdk_macos_surface_reposition_children (gdk_surface);
+
+  [self checkSendEnterNotify];
 }

 -(id)initWithContentRect:(NSRect)contentRect
@@ -228,7 +274,7 @@ typedef NSString *CALayerContentsGravity;
                   defer:(BOOL)flag
                  screen:(NSScreen *)screen
 {
-  GdkMacosView *view;
+  GdkMacosCairoView *view;

  self = [super initWithContentRect:contentRect
 	                        styleMask:styleMask
@@ -239,9 +285,8 @@ typedef NSString *CALayerContentsGravity;
  [self setAcceptsMouseMovedEvents:YES];
  [self setDelegate:(id<NSWindowDelegate>)self];
  [self setReleasedWhenClosed:YES];
-  [self setPreservesContentDuringLiveResize:NO];

-  view = [[GdkMacosView alloc] initWithFrame:contentRect];
+  view = [[GdkMacosCairoView alloc] initWithFrame:contentRect];
  [self setContentView:view];
  [view release];

@@ -258,8 +303,7 @@ typedef NSString *CALayerContentsGravity;

 -(BOOL)canBecomeKeyWindow
 {
-  return GDK_IS_TOPLEVEL (gdk_surface) ||
-         (GDK_IS_POPUP (gdk_surface) && GDK_SURFACE (gdk_surface)->input_region != NULL);
+  return GDK_IS_TOPLEVEL (gdk_surface);
 }

 -(void)showAndMakeKey:(BOOL)makeKey
@@ -267,12 +311,9 @@ typedef NSString *CALayerContentsGravity;
  inShowOrHide = YES;

  if (makeKey && [self canBecomeKeyWindow])
-    [self makeKeyAndOrderFront:self];
+    [self makeKeyAndOrderFront:nil];
  else
-    [self orderFront:self];
-
-  if (makeKey && [self canBecomeMainWindow])
-    [self makeMainWindow];
+    [self orderFront:nil];

  inShowOrHide = NO;

@@ -370,31 +411,12 @@ typedef NSString *CALayerContentsGravity;
  windowFrame.origin.x = new_origin.x;
  windowFrame.origin.y = new_origin.y;

-  [self setFrame:NSMakeRect (new_origin.x, new_origin.y,
-                             window_gdk.width, window_gdk.height)
-         display:YES];
+  /* And now apply the frame to the window */
+  [self setFrameOrigin:NSMakePoint(new_origin.x, new_origin.y)];

  return YES;
 }

-(void)windowDidMove:(NSNotification *)notification
-{
-  _gdk_macos_surface_configure ([self gdkSurface]);
-}
-
-(void)windowDidResize:(NSNotification *)notification
-{
-  _gdk_macos_surface_configure (gdk_surface);
-
-  /* If we're using server-side decorations, this notification is coming
-   * in from a display-side change. We need to request a layout in
-   * addition to the configure event.
-   */
-  if (GDK_IS_MACOS_TOPLEVEL_SURFACE (gdk_surface) &&
-      GDK_MACOS_TOPLEVEL_SURFACE (gdk_surface)->decorated)
-    gdk_surface_request_layout (GDK_SURFACE (gdk_surface));
-}
-
 /* Used by gdkmacosdisplay-translate.c to decide if our sendEvent() handler
 * above will see the event or if it will be subjected to standard processing
 * by GDK.
@@ -406,7 +428,6 @@ typedef NSString *CALayerContentsGravity;

 -(void)beginManualMove
 {
-  gboolean maximized = GDK_SURFACE (gdk_surface)->state & GDK_TOPLEVEL_STATE_MAXIMIZED;
  NSPoint initialMoveLocation;
  GdkPoint point;
  GdkMonitor *monitor;
@@ -425,13 +446,6 @@ typedef NSString *CALayerContentsGravity;

  initialMoveLocation = [NSEvent mouseLocation];

-  if (maximized)
-    [self setFrame:NSMakeRect (initialMoveLocation.x - (int)lastUnmaximizedFrame.size.width/2,
-                               initialMoveLocation.y,
-                               lastUnmaximizedFrame.size.width,
-                               lastUnmaximizedFrame.size.height)
-           display:YES];
-
  _gdk_macos_display_from_display_coords ([self gdkDisplay],
                                          initialMoveLocation.x,
                                          initialMoveLocation.y,
@@ -523,7 +537,15 @@ typedef NSString *CALayerContentsGravity;
      new_frame.size.height = min_size.height;
    }

-  _gdk_macos_surface_user_resize ([self gdkSurface], new_frame);
+  /* We could also apply aspect ratio:
+     new_frame.size.height = new_frame.size.width / [self aspectRatio].width * [self aspectRatio].height;
+  */
+
+  [self setFrame:new_frame display:YES];
+
+  /* Let the resizing be handled by GTK. */
+  if (g_main_context_pending (NULL))
+    g_main_context_iteration (NULL, FALSE);

  inTrackManualResize = NO;

@@ -532,46 +554,49 @@ typedef NSString *CALayerContentsGravity;

 -(void)beginManualResize:(GdkSurfaceEdge)edge
 {
-  CALayerContentsGravity gravity = kCAGravityBottomLeft;
-
  if (inMove || inManualMove || inManualResize)
    return;

  inManualResize = YES;
  resizeEdge = edge;

-  switch (edge)
+  if (GDK_IS_MACOS_GL_VIEW ([self contentView]))
    {
-    default:
-    case GDK_SURFACE_EDGE_NORTH:
-      gravity = kCAGravityTopLeft;
-      break;
+      CALayerContentsGravity gravity = kCAGravityBottomLeft;

-    case GDK_SURFACE_EDGE_NORTH_WEST:
-      gravity = kCAGravityTopRight;
-      break;
+      switch (edge)
+        {
+        default:
+        case GDK_SURFACE_EDGE_NORTH:
+          gravity = kCAGravityTopLeft;
+          break;

-    case GDK_SURFACE_EDGE_SOUTH_WEST:
-    case GDK_SURFACE_EDGE_WEST:
-      gravity = kCAGravityBottomRight;
-      break;
+        case GDK_SURFACE_EDGE_NORTH_WEST:
+          gravity = kCAGravityTopRight;
+          break;

-    case GDK_SURFACE_EDGE_SOUTH:
-    case GDK_SURFACE_EDGE_SOUTH_EAST:
-      gravity = kCAGravityBottomLeft;
-      break;
+        case GDK_SURFACE_EDGE_SOUTH_WEST:
+        case GDK_SURFACE_EDGE_WEST:
+          gravity = kCAGravityBottomRight;
+          break;

-    case GDK_SURFACE_EDGE_EAST:
-      gravity = kCAGravityBottomLeft;
-      break;
+        case GDK_SURFACE_EDGE_SOUTH:
+        case GDK_SURFACE_EDGE_SOUTH_EAST:
+          gravity = kCAGravityBottomLeft;
+          break;

-    case GDK_SURFACE_EDGE_NORTH_EAST:
-      gravity = kCAGravityTopLeft;
-      break;
+        case GDK_SURFACE_EDGE_EAST:
+          gravity = kCAGravityBottomLeft;
+          break;
+
+        case GDK_SURFACE_EDGE_NORTH_EAST:
+          gravity = kCAGravityTopLeft;
+          break;
+        }
+
+      [[[self contentView] layer] setContentsGravity:gravity];
    }

-  [[[self contentView] layer] setContentsGravity:gravity];
-
  initialResizeFrame = [self frame];
  initialResizeLocation = convert_nspoint_to_screen (self, [self mouseLocationOutsideOfEventStream]);
 }
@@ -685,12 +710,7 @@ typedef NSString *CALayerContentsGravity;
  is_opaque = (([self styleMask] & NSWindowStyleMaskTitled) != 0);

  if (was_fullscreen != is_fullscreen)
-    {
-      if (was_fullscreen)
-        [self setFrame:lastUnfullscreenFrame display:NO];
-
-      _gdk_macos_surface_update_fullscreen_state (gdk_surface);
-    }
+    _gdk_macos_surface_update_fullscreen_state (gdk_surface);

  if (was_opaque != is_opaque)
    {
@@ -740,6 +760,7 @@ typedef NSString *CALayerContentsGravity;
  if (state & GDK_TOPLEVEL_STATE_MAXIMIZED)
    {
      lastMaximizedFrame = newFrame;
+      [self windowDidUnmaximize];
    }
  else
    {
@@ -754,7 +775,16 @@ typedef NSString *CALayerContentsGravity;

 -(void)windowDidEndLiveResize:(NSNotification *)aNotification
 {
+  gboolean maximized = GDK_SURFACE (gdk_surface)->state & GDK_TOPLEVEL_STATE_MAXIMIZED;
+
  inMaximizeTransition = NO;
+
+  /* Even if this is CSD, we want to be opaque while maximized
+   * to speed up compositing by allowing the display server to
+   * avoid costly blends.
+   */
+  if (maximized)
+    [self setOpaque:YES];
 }

 -(NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)proposedSize
@@ -764,37 +794,16 @@ typedef NSString *CALayerContentsGravity;

 -(void)windowWillEnterFullScreen:(NSNotification *)aNotification
 {
-  inFullscreenTransition = YES;
  lastUnfullscreenFrame = [self frame];
 }

-(void)windowDidEnterFullScreen:(NSNotification *)aNotification
-{
-  inFullscreenTransition = NO;
-  initialPositionKnown = NO;
-  [self checkSendEnterNotify];
-}
-
 -(void)windowWillExitFullScreen:(NSNotification *)aNotification
 {
-  inFullscreenTransition = YES;
+  [self setFrame:lastUnfullscreenFrame display:YES];
 }

 -(void)windowDidExitFullScreen:(NSNotification *)aNotification
 {
-  inFullscreenTransition = NO;
-  initialPositionKnown = NO;
-  [self checkSendEnterNotify];
-}
-
-(void)windowDidFailToEnterFullScreen:(NSNotification *)aNotification
-{
-  inFullscreenTransition = NO;
-}
-
-(void)windowDidFailToExitFullScreen:(NSNotification *)aNotification
-{
-  inFullscreenTransition = NO;
 }

 -(void)windowDidChangeScreen:(NSNotification *)aNotification
@@ -836,15 +845,4 @@ typedef NSString *CALayerContentsGravity;
  return NO;
 }

-(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage
-{
-  [(GdkMacosView *)[self contentView] swapBuffer:buffer withDamage:damage];
-}
-
-(BOOL)needsMouseDownQuirk
-{
-  return GDK_IS_MACOS_TOPLEVEL_SURFACE (gdk_surface) &&
-    !GDK_MACOS_TOPLEVEL_SURFACE (gdk_surface)->decorated;
-}
-
@end
@@ -21,11 +21,9 @@

 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
-#import <IOSurface/IOSurface.h>

 #include <gdk/gdk.h>

-#include "gdkmacosbuffer-private.h"
 #include "gdkmacosdisplay.h"
 #include "gdkmacossurface.h"
 #include "edgesnapping.h"
@@ -53,7 +51,6 @@
  NSRect           lastMaximizedFrame;
  NSRect           lastUnfullscreenFrame;
  BOOL             inMaximizeTransition;
-  BOOL             inFullscreenTransition;
 }

 -(void)beginManualMove;
@@ -69,8 +66,5 @@
 -(BOOL)trackManualMove;
 -(BOOL)trackManualResize;
 -(void)setDecorated:(BOOL)decorated;
-(void)swapBuffer:(GdkMacosBuffer *)buffer withDamage:(const cairo_region_t *)damage;
-(BOOL)needsMouseDownQuirk;
-(BOOL)inFullscreenTransition;

@end
@@ -26,10 +26,7 @@

 #include "gdkdisplaylinksource.h"

-#include "gdkdebug.h"
 #include "gdkmacoseventsource-private.h"
-#include "gdkmacosmonitor-private.h"
-#include "gdk-private.h"

 static gint64 host_to_frame_clock_time (gint64 val);

@@ -67,7 +64,7 @@ gdk_display_link_source_dispatch (GSource     *source,

  impl->needs_dispatch = FALSE;

-  if (!impl->paused && callback != NULL)
+  if (callback != NULL)
    ret = callback (user_data);

  return ret;
@@ -78,9 +75,7 @@ gdk_display_link_source_finalize (GSource *source)
 {
  GdkDisplayLinkSource *impl = (GdkDisplayLinkSource *)source;

-  if (!impl->paused)
-    CVDisplayLinkStop (impl->display_link);
-
+  CVDisplayLinkStop (impl->display_link);
  CVDisplayLinkRelease (impl->display_link);
 }

@@ -94,18 +89,12 @@ static GSourceFuncs gdk_display_link_source_funcs = {
 void
 gdk_display_link_source_pause (GdkDisplayLinkSource *source)
 {
-  g_return_if_fail (source->paused == FALSE);
-
-  source->paused = TRUE;
  CVDisplayLinkStop (source->display_link);
 }

 void
 gdk_display_link_source_unpause (GdkDisplayLinkSource *source)
 {
-  g_return_if_fail (source->paused == TRUE);
-
-  source->paused = FALSE;
  CVDisplayLinkStart (source->display_link);
 }

@@ -157,7 +146,6 @@ gdk_display_link_source_frame_cb (CVDisplayLinkRef   display_link,

 /**
 * gdk_display_link_source_new:
- * @display_id: the identifier of the monitor
 *
 * Creates a new `GSource` that will activate the dispatch function upon
 * notification from a CVDisplayLink that a new frame should be drawn.
@@ -170,61 +158,41 @@ gdk_display_link_source_frame_cb (CVDisplayLinkRef   display_link,
 * Returns: (transfer full): A newly created `GSource`
 */
 GSource *
-gdk_display_link_source_new (CGDirectDisplayID display_id,
-                             CGDisplayModeRef  mode)
+gdk_display_link_source_new (void)
 {
  GdkDisplayLinkSource *impl;
  GSource *source;
-  char *name;
+  CVReturn ret;
+  double period;

  source = g_source_new (&gdk_display_link_source_funcs, sizeof *impl);
  impl = (GdkDisplayLinkSource *)source;
-  impl->display_id = display_id;
-  impl->paused = TRUE;

-  /* Create DisplayLink for timing information for the display in
-   * question so that we can produce graphics for that display at whatever
-   * rate it can provide.
+  /*
+   * Create our link based on currently connected displays.
+   * If there are multiple displays, this will be something that tries
+   * to work for all of them. In the future, we may want to explore multiple
+   * links based on the connected displays.
   */
-  if (CVDisplayLinkCreateWithCGDisplay (display_id, &impl->display_link) != kCVReturnSuccess)
+  ret = CVDisplayLinkCreateWithActiveCGDisplays (&impl->display_link);
+  if (ret != kCVReturnSuccess)
    {
      g_warning ("Failed to initialize CVDisplayLink!");
-      goto failure;
+      return source;
    }

-  impl->refresh_rate = CGDisplayModeGetRefreshRate (mode) * 1000.0;
+  /*
+   * Determine our nominal period between frames.
+   */
+  period = CVDisplayLinkGetActualOutputVideoRefreshPeriod (impl->display_link);
+  if (period == 0.0)
+    period = 1.0 / 60.0;
+  impl->refresh_interval = period * 1000000L;
+  impl->refresh_rate = 1.0 / period * 1000L;

-  if (impl->refresh_rate == 0)
-    {
-      const CVTime time = CVDisplayLinkGetNominalOutputVideoRefreshPeriod (impl->display_link);
-      if (!(time.flags & kCVTimeIsIndefinite))
-        impl->refresh_rate = (double)time.timeScale / (double)time.timeValue * 1000.0;
-    }
-
-  if (impl->refresh_rate != 0)
-    {
-      impl->refresh_interval = 1000000.0 / (double)impl->refresh_rate * 1000.0;
-    }
-  else
-    {
-      double period = CVDisplayLinkGetActualOutputVideoRefreshPeriod (impl->display_link);
-
-      if (period == 0.0)
-        period = 1.0 / 60.0;
-
-      impl->refresh_rate = 1.0 / period * 1000L;
-      impl->refresh_interval = period * 1000000L;
-    }
-
-  name = _gdk_macos_monitor_get_connector_name (display_id);
-  GDK_NOTE (MISC,
-            g_message ("Monitor \"%s\" discovered with Refresh Rate %d and Interval %"G_GINT64_FORMAT,
-                       name ? name : "unknown",
-                       impl->refresh_rate,
-                       impl->refresh_interval));
-  g_free (name);
-
-  /* Wire up our callback to be executed within the high-priority thread. */
+  /*
+   * Wire up our callback to be executed within the high-priority thread.
+   */
  CVDisplayLinkSetOutputCallback (impl->display_link,
                                  gdk_display_link_source_frame_cb,
                                  source);
@@ -232,10 +200,6 @@ gdk_display_link_source_new (CGDirectDisplayID display_id,
  g_source_set_static_name (source, "[gdk] quartz frame clock");

  return source;
-
-failure:
-  g_source_unref (source);
-  return NULL;
 }

 static gint64
@@ -30,20 +30,17 @@ G_BEGIN_DECLS

 typedef struct
 {
-  GSource           source;
+  GSource          source;

-  CGDirectDisplayID display_id;
-  CVDisplayLinkRef  display_link;
-  gint64            refresh_interval;
-  guint             refresh_rate;
-  guint             paused : 1;
+  CVDisplayLinkRef display_link;
+  gint64           refresh_interval;
+  guint            refresh_rate;

-  volatile gint64   presentation_time;
-  volatile guint    needs_dispatch;
+  volatile gint64  presentation_time;
+  volatile guint   needs_dispatch;
 } GdkDisplayLinkSource;

-GSource *gdk_display_link_source_new     (CGDirectDisplayID     display_id,
-                                          CGDisplayModeRef      mode);
+GSource *gdk_display_link_source_new     (void);
 void     gdk_display_link_source_pause   (GdkDisplayLinkSource *source);
 void     gdk_display_link_source_unpause (GdkDisplayLinkSource *source);

@@ -1,60 +0,0 @@
-/*
- * Copyright © 2021 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.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#ifndef __GDK_MACOS_BUFFER_PRIVATE_H__
-#define __GDK_MACOS_BUFFER_PRIVATE_H__
-
-#include <CoreGraphics/CoreGraphics.h>
-#include <Foundation/Foundation.h>
-#include <IOSurface/IOSurface.h>
-
-#include <cairo.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_MACOS_BUFFER (gdk_macos_buffer_get_type())
-
-G_DECLARE_FINAL_TYPE (GdkMacosBuffer, gdk_macos_buffer, GDK, MACOS_BUFFER, GObject)
-
-GdkMacosBuffer       *_gdk_macos_buffer_new              (int              width,
-                                                          int              height,
-                                                          double           device_scale,
-                                                          int              bytes_per_element,
-                                                          int              bits_per_pixel);
-IOSurfaceRef          _gdk_macos_buffer_get_native       (GdkMacosBuffer  *self);
-void                  _gdk_macos_buffer_lock             (GdkMacosBuffer  *self);
-void                  _gdk_macos_buffer_unlock           (GdkMacosBuffer  *self);
-void                  _gdk_macos_buffer_read_lock        (GdkMacosBuffer  *self);
-void                  _gdk_macos_buffer_read_unlock      (GdkMacosBuffer  *self);
-guint                 _gdk_macos_buffer_get_width        (GdkMacosBuffer  *self);
-guint                 _gdk_macos_buffer_get_height       (GdkMacosBuffer  *self);
-guint                 _gdk_macos_buffer_get_stride       (GdkMacosBuffer  *self);
-double                _gdk_macos_buffer_get_device_scale (GdkMacosBuffer  *self);
-const cairo_region_t *_gdk_macos_buffer_get_damage       (GdkMacosBuffer  *self);
-void                  _gdk_macos_buffer_set_damage       (GdkMacosBuffer  *self,
-                                                          cairo_region_t  *damage);
-gpointer              _gdk_macos_buffer_get_data         (GdkMacosBuffer  *self);
-gboolean              _gdk_macos_buffer_get_flipped      (GdkMacosBuffer  *self);
-void                  _gdk_macos_buffer_set_flipped      (GdkMacosBuffer  *self,
-                                                          gboolean         flipped);
-
-G_END_DECLS
-
-#endif /* __GDK_MACOS_BUFFER_PRIVATE_H__ */
@@ -1,310 +0,0 @@
-/*
- * Copyright © 2021 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.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include "config.h"
-
-#include <IOSurface/IOSurface.h>
-#include <Foundation/Foundation.h>
-#include <OpenGL/CGLIOSurface.h>
-#include <QuartzCore/QuartzCore.h>
-
-#include "gdkmacosbuffer-private.h"
-
-struct _GdkMacosBuffer
-{
-  GObject          parent_instance;
-  cairo_region_t  *damage;
-  IOSurfaceRef     surface;
-  int              lock_count;
-  guint            bytes_per_element;
-  guint            bits_per_pixel;
-  guint            width;
-  guint            height;
-  guint            stride;
-  double           device_scale;
-  guint            flipped : 1;
-};
-
-G_DEFINE_TYPE (GdkMacosBuffer, gdk_macos_buffer, G_TYPE_OBJECT)
-
-static void
-gdk_macos_buffer_dispose (GObject *object)
-{
-  GdkMacosBuffer *self = (GdkMacosBuffer *)object;
-
-  if (self->lock_count != 0)
-    g_critical ("Attempt to dispose %s while lock is held",
-                G_OBJECT_TYPE_NAME (self));
-
-  /* We could potentially force the unload of our surface here with
-   * IOSurfaceSetPurgeable (self->surface, kIOSurfacePurgeableEmpty, NULL)
-   * but that would cause it to empty when the layers may still be attached
-   * to it. Better to just let it get GC'd by the system after they have
-   * moved on to a new buffer.
-   */
-  g_clear_pointer (&self->surface, CFRelease);
-  g_clear_pointer (&self->damage, cairo_region_destroy);
-
-  G_OBJECT_CLASS (gdk_macos_buffer_parent_class)->dispose (object);
-}
-
-static void
-gdk_macos_buffer_class_init (GdkMacosBufferClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gdk_macos_buffer_dispose;
-}
-
-static void
-gdk_macos_buffer_init (GdkMacosBuffer *self)
-{
-}
-
-static void
-add_int (CFMutableDictionaryRef dict,
-         const CFStringRef      key,
-         int                    value)
-{
-  CFNumberRef number = CFNumberCreate (NULL, kCFNumberIntType, &value);
-  CFDictionaryAddValue (dict, key, number);
-  CFRelease (number);
-}
-
-static IOSurfaceRef
-create_surface (int   width,
-                int   height,
-                int   bytes_per_element,
-                guint *stride)
-{
-  CFMutableDictionaryRef props;
-  IOSurfaceRef ret;
-  size_t bytes_per_row;
-  size_t total_bytes;
-
-  props = CFDictionaryCreateMutable (kCFAllocatorDefault,
-                                     16,
-                                     &kCFTypeDictionaryKeyCallBacks,
-                                     &kCFTypeDictionaryValueCallBacks);
-  if (props == NULL)
-    return NULL;
-
-  bytes_per_row = IOSurfaceAlignProperty (kIOSurfaceBytesPerRow, width * bytes_per_element);
-  total_bytes = IOSurfaceAlignProperty (kIOSurfaceAllocSize, height * bytes_per_row);
-
-  add_int (props, kIOSurfaceAllocSize, total_bytes);
-  add_int (props, kIOSurfaceBytesPerElement, bytes_per_element);
-  add_int (props, kIOSurfaceBytesPerRow, bytes_per_row);
-  add_int (props, kIOSurfaceHeight, height);
-  add_int (props, kIOSurfacePixelFormat, (int)'BGRA');
-  add_int (props, kIOSurfaceWidth, width);
-
-  ret = IOSurfaceCreate (props);
-
-  CFRelease (props);
-
-  *stride = bytes_per_row;
-
-  return ret;
-}
-
-GdkMacosBuffer *
-_gdk_macos_buffer_new (int    width,
-                       int    height,
-                       double device_scale,
-                       int    bytes_per_element,
-                       int    bits_per_pixel)
-{
-  GdkMacosBuffer *self;
-
-  g_return_val_if_fail (width > 0, NULL);
-  g_return_val_if_fail (height > 0, NULL);
-
-  self = g_object_new (GDK_TYPE_MACOS_BUFFER, NULL);
-  self->bytes_per_element = bytes_per_element;
-  self->bits_per_pixel = bits_per_pixel;
-  self->surface = create_surface (width, height, bytes_per_element, &self->stride);
-  self->width = width;
-  self->height = height;
-  self->device_scale = device_scale;
-  self->lock_count = 0;
-
-  if (self->surface == NULL)
-    g_clear_object (&self);
-
-  return self;
-}
-
-IOSurfaceRef
-_gdk_macos_buffer_get_native (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), NULL);
-
-  return self->surface;
-}
-
-/**
- * _gdk_macos_buffer_lock:
- *
- * This function matches the IOSurfaceLock() name but what it really
- * does is page the buffer back for the CPU to access from VRAM.
- *
- * Generally we don't want to do that, but we do need to in some
- * cases such as when we are rendering with Cairo. There might
- * be an opportunity later to avoid that, but since we are using
- * GL pretty much everywhere already, we don't try.
- */
-void
-_gdk_macos_buffer_lock (GdkMacosBuffer *self)
-{
-  g_return_if_fail (GDK_IS_MACOS_BUFFER (self));
-  g_return_if_fail (self->lock_count == 0);
-
-  self->lock_count++;
-
-  IOSurfaceLock (self->surface, 0, NULL);
-}
-
-void
-_gdk_macos_buffer_unlock (GdkMacosBuffer *self)
-{
-  g_return_if_fail (GDK_IS_MACOS_BUFFER (self));
-  g_return_if_fail (self->lock_count == 1);
-
-  self->lock_count--;
-
-  IOSurfaceUnlock (self->surface, 0, NULL);
-}
-
-/**
- * _gdk_macos_buffer_lock_readonly:
- *
- * Like _gdk_macos_buffer_lock() but uses the read-only flag to
- * indicate we are not interested in retrieving the updates from
- * the GPU before modifying the CPU-side cache.
- *
- * Must be used with _gdk_macos_buffer_unlock_readonly().
- */
-void
-_gdk_macos_buffer_read_lock (GdkMacosBuffer *self)
-{
-  kern_return_t ret;
-
-  g_return_if_fail (GDK_IS_MACOS_BUFFER (self));
-  g_return_if_fail (self->lock_count == 0);
-
-  self->lock_count++;
-
-  ret = IOSurfaceLock (self->surface, kIOSurfaceLockReadOnly, NULL);
-
-  g_return_if_fail (ret == KERN_SUCCESS);
-}
-
-void
-_gdk_macos_buffer_read_unlock (GdkMacosBuffer *self)
-{
-  kern_return_t ret;
-
-  g_return_if_fail (GDK_IS_MACOS_BUFFER (self));
-  g_return_if_fail (self->lock_count == 1);
-
-  self->lock_count--;
-
-  ret = IOSurfaceUnlock (self->surface, kIOSurfaceLockReadOnly, NULL);
-
-  g_return_if_fail (ret == KERN_SUCCESS);
-}
-
-guint
-_gdk_macos_buffer_get_width (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), 0);
-
-  return self->width;
-}
-
-guint
-_gdk_macos_buffer_get_height (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), 0);
-
-  return self->height;
-}
-
-guint
-_gdk_macos_buffer_get_stride (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), 0);
-
-  return self->stride;
-}
-
-double
-_gdk_macos_buffer_get_device_scale (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), 1.0);
-
-  return self->device_scale;
-}
-
-const cairo_region_t *
-_gdk_macos_buffer_get_damage (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), NULL);
-
-  return self->damage;
-}
-
-void
-_gdk_macos_buffer_set_damage (GdkMacosBuffer *self,
-                              cairo_region_t *damage)
-{
-  g_return_if_fail (GDK_IS_MACOS_BUFFER (self));
-
-  if (damage == self->damage)
-    return;
-
-  g_clear_pointer (&self->damage, cairo_region_destroy);
-  self->damage = cairo_region_copy (damage);
-}
-
-gpointer
-_gdk_macos_buffer_get_data (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), NULL);
-
-  return IOSurfaceGetBaseAddress (self->surface);
-}
-
-gboolean
-_gdk_macos_buffer_get_flipped (GdkMacosBuffer *self)
-{
-  g_return_val_if_fail (GDK_IS_MACOS_BUFFER (self), FALSE);
-
-  return self->flipped;
-}
-
-void
-_gdk_macos_buffer_set_flipped (GdkMacosBuffer *self,
-                               gboolean        flipped)
-{
-  g_return_if_fail (GDK_IS_MACOS_BUFFER (self));
-
-  self->flipped = !!flipped;
-}
@@ -22,17 +22,18 @@

 #include "gdkconfig.h"

-#include <cairo.h>
-#include <QuartzCore/QuartzCore.h>
 #include <CoreGraphics/CoreGraphics.h>

-#include "gdkmacosbuffer-private.h"
+#import "GdkMacosCairoView.h"
+
 #include "gdkmacoscairocontext-private.h"
 #include "gdkmacossurface-private.h"

 struct _GdkMacosCairoContext
 {
-  GdkCairoContext parent_instance;
+  GdkCairoContext  parent_instance;
+
+  cairo_surface_t *window_surface;
 };

 struct _GdkMacosCairoContextClass
@@ -42,150 +43,41 @@ struct _GdkMacosCairoContextClass

 G_DEFINE_TYPE (GdkMacosCairoContext, _gdk_macos_cairo_context, GDK_TYPE_CAIRO_CONTEXT)

+static cairo_surface_t *
+create_cairo_surface_for_surface (GdkSurface *surface)
+{
+  cairo_surface_t *cairo_surface;
+  int scale;
+  int width;
+  int height;
+
+  g_assert (GDK_IS_MACOS_SURFACE (surface));
+
+  scale = gdk_surface_get_scale_factor (surface);
+  width = scale * gdk_surface_get_width (surface);
+  height = scale * gdk_surface_get_height (surface);
+
+  /* We use a cairo image surface here instead of a quartz surface because we
+   * get strange artifacts with the quartz surface such as empty cross-fades
+   * when hovering buttons. For performance, we want to be using GL rendering
+   * so there isn't much point here as correctness is better.
+   */
+  cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+
+  if (cairo_surface != NULL)
+    cairo_surface_set_device_scale (cairo_surface, scale, scale);
+
+  return cairo_surface;
+}
+
 static cairo_t *
 _gdk_macos_cairo_context_cairo_create (GdkCairoContext *cairo_context)
 {
  GdkMacosCairoContext *self = (GdkMacosCairoContext *)cairo_context;
-  const cairo_region_t *damage;
-  cairo_surface_t *image_surface;
-  GdkMacosBuffer *buffer;
-  GdkSurface *surface;
-  NSWindow *nswindow;
-  cairo_t *cr;
-  gpointer data;
-  double scale;
-  guint width;
-  guint height;
-  guint stride;
-  gboolean opaque;

  g_assert (GDK_IS_MACOS_CAIRO_CONTEXT (self));

-  surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (self));
-  nswindow = _gdk_macos_surface_get_native (GDK_MACOS_SURFACE (surface));
-  opaque = [nswindow isOpaque];
-
-  buffer = _gdk_macos_surface_get_buffer (GDK_MACOS_SURFACE (surface));
-  damage = _gdk_macos_buffer_get_damage (buffer);
-  width = _gdk_macos_buffer_get_width (buffer);
-  height = _gdk_macos_buffer_get_height (buffer);
-  scale = _gdk_macos_buffer_get_device_scale (buffer);
-  stride = _gdk_macos_buffer_get_stride (buffer);
-  data = _gdk_macos_buffer_get_data (buffer);
-
-  /* Instead of forcing cairo to do everything through a CGContext,
-   * we just use an image surface backed by an IOSurfaceRef mapped
-   * into user-space. We can then use pixman which is quite fast as
-   * far as software rendering goes.
-   *
-   * Additionally, cairo_quartz_surface_t can't handle a number of
-   * tricks that the GSK cairo renderer does with border nodes and
-   * shadows, so an image surface is necessary for that.
-   *
-   * Since our IOSurfaceRef is width*scale-by-height*scale, we undo
-   * the scaling using cairo_surface_set_device_scale() so the renderer
-   * just thinks it's on a 2x scale surface for HiDPI.
-   */
-  image_surface = cairo_image_surface_create_for_data (data,
-                                                       CAIRO_FORMAT_ARGB32,
-                                                       width,
-                                                       height,
-                                                       stride);
-  cairo_surface_set_device_scale (image_surface, scale, scale);
-
-  /* The buffer should already be locked at this point, and will
-   * be unlocked as part of end_frame.
-   */
-
-  if (!(cr = cairo_create (image_surface)))
-    goto failure;
-
-  /* Clip to the current damage region */
-  if (damage != NULL)
-    {
-      gdk_cairo_region (cr, damage);
-      cairo_clip (cr);
-    }
-
-  /* If we have some exposed transparent area in the damage region,
-   * we need to clear the existing content first to leave an transparent
-   * area for cairo. We use (surface_bounds or damage)-(opaque) to get
-   * the smallest set of rectangles we need to clear as it's expensive.
-   */
-  if (!opaque)
-    {
-      cairo_region_t *transparent;
-      cairo_rectangle_int_t r = { 0, 0, width/scale, height/scale };
-
-      cairo_save (cr);
-
-      if (damage != NULL)
-        cairo_region_get_extents (damage, &r);
-      transparent = cairo_region_create_rectangle (&r);
-      if (surface->opaque_region)
-        cairo_region_subtract (transparent, surface->opaque_region);
-
-      if (!cairo_region_is_empty (transparent))
-        {
-          gdk_cairo_region (cr, transparent);
-          cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-          cairo_fill (cr);
-        }
-
-      cairo_region_destroy (transparent);
-      cairo_restore (cr);
-    }
-
-failure:
-  cairo_surface_destroy (image_surface);
-
-  return cr;
-}
-
-static void
-copy_surface_data (GdkMacosBuffer       *from,
-                   GdkMacosBuffer       *to,
-                   const cairo_region_t *region,
-                   int                   scale)
-{
-  const guint8 *from_base;
-  guint8 *to_base;
-  guint from_stride;
-  guint to_stride;
-  guint n_rects;
-
-  g_assert (GDK_IS_MACOS_BUFFER (from));
-  g_assert (GDK_IS_MACOS_BUFFER (to));
-  g_assert (region != NULL);
-  g_assert (!cairo_region_is_empty (region));
-
-  from_base = _gdk_macos_buffer_get_data (from);
-  from_stride = _gdk_macos_buffer_get_stride (from);
-
-  to_base = _gdk_macos_buffer_get_data (to);
-  to_stride = _gdk_macos_buffer_get_stride (to);
-
-  n_rects = cairo_region_num_rectangles (region);
-
-  for (guint i = 0; i < n_rects; i++)
-    {
-      cairo_rectangle_int_t rect;
-      int y2;
-
-      cairo_region_get_rectangle (region, i, &rect);
-
-      rect.y *= scale;
-      rect.height *= scale;
-      rect.x *= scale;
-      rect.width *= scale;
-
-      y2 = rect.y + rect.height;
-
-      for (int y = rect.y; y < y2; y++)
-        memcpy (&to_base[y * to_stride + rect.x * 4],
-                &from_base[y * from_stride + rect.x * 4],
-                rect.width * 4);
-    }
+  return cairo_create (self->window_surface);
 }

 static void
@@ -194,49 +86,28 @@ _gdk_macos_cairo_context_begin_frame (GdkDrawContext *draw_context,
                                      cairo_region_t *region)
 {
  GdkMacosCairoContext *self = (GdkMacosCairoContext *)draw_context;
-  GdkMacosBuffer *buffer;
-  GdkMacosSurface *surface;
+  GdkSurface *surface;
+  NSWindow *nswindow;

  g_assert (GDK_IS_MACOS_CAIRO_CONTEXT (self));

-  [CATransaction begin];
-  [CATransaction setDisableActions:YES];
+  surface = gdk_draw_context_get_surface (draw_context);
+  nswindow = _gdk_macos_surface_get_native (GDK_MACOS_SURFACE (surface));

-  surface = GDK_MACOS_SURFACE (gdk_draw_context_get_surface (draw_context));
-  buffer = _gdk_macos_surface_get_buffer (surface);
-
-  _gdk_macos_buffer_set_damage (buffer, region);
-  _gdk_macos_buffer_set_flipped (buffer, FALSE);
-
-  _gdk_macos_buffer_lock (buffer);
-
-  /* If there is damage that was on the previous frame that is not on
-   * this frame, we need to copy that rendered region over to the back
-   * buffer so that when swapping buffers, we still have that content.
-   * This is done with a read-only lock on the IOSurface to avoid
-   * invalidating the buffer contents.
-   */
-  if (surface->front != NULL)
+  if (self->window_surface == NULL)
    {
-      const cairo_region_t *previous = _gdk_macos_buffer_get_damage (surface->front);
-
-      if (previous != NULL)
+      self->window_surface = create_cairo_surface_for_surface (surface);
+    }
+  else
+    {
+      if (![nswindow isOpaque])
        {
-          cairo_region_t *copy;
-
-          copy = cairo_region_copy (previous);
-          cairo_region_subtract (copy, region);
-
-          if (!cairo_region_is_empty (copy))
-            {
-              int scale = gdk_surface_get_scale_factor (GDK_SURFACE (surface));
-
-              _gdk_macos_buffer_read_lock (surface->front);
-              copy_surface_data (surface->front, buffer, copy, scale);
-              _gdk_macos_buffer_read_unlock (surface->front);
-            }
-
-          cairo_region_destroy (copy);
+          cairo_t *cr = cairo_create (self->window_surface);
+          gdk_cairo_region (cr, region);
+          cairo_set_source_rgba (cr, 0, 0, 0, 0);
+          cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+          cairo_fill (cr);
+          cairo_destroy (cr);
        }
    }
 }
@@ -246,27 +117,28 @@ _gdk_macos_cairo_context_end_frame (GdkDrawContext *draw_context,
                                    cairo_region_t *painted)
 {
  GdkMacosCairoContext *self = (GdkMacosCairoContext *)draw_context;
-  GdkMacosSurface *surface;
-  GdkMacosBuffer *buffer;
+  GdkSurface *surface;
+  NSView *nsview;

  g_assert (GDK_IS_MACOS_CAIRO_CONTEXT (self));
+  g_assert (self->window_surface != NULL);

-  surface = GDK_MACOS_SURFACE (gdk_draw_context_get_surface (draw_context));
-  buffer = _gdk_macos_surface_get_buffer (surface);
+  surface = gdk_draw_context_get_surface (draw_context);
+  nsview = _gdk_macos_surface_get_view (GDK_MACOS_SURFACE (surface));

-  _gdk_macos_buffer_unlock (buffer);
-
-  _gdk_macos_surface_swap_buffers (surface, painted);
-
-  [CATransaction commit];
+  if (GDK_IS_MACOS_CAIRO_VIEW (nsview))
+    [(GdkMacosCairoView *)nsview setCairoSurface:self->window_surface
+                                      withDamage:painted];
 }

 static void
 _gdk_macos_cairo_context_surface_resized (GdkDrawContext *draw_context)
 {
-  g_assert (GDK_IS_MACOS_CAIRO_CONTEXT (draw_context));
+  GdkMacosCairoContext *self = (GdkMacosCairoContext *)draw_context;

-  /* Do nothing, next begin_frame will get new buffer */
+  g_assert (GDK_IS_MACOS_CAIRO_CONTEXT (self));
+
+  g_clear_pointer (&self->window_surface, cairo_surface_destroy);
 }

 static void
@@ -1,105 +0,0 @@
-/*
- * Copyright © 2022 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.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include "config.h"
-
-#include <AppKit/AppKit.h>
-
-#include "gdkmacosdisplay-private.h"
-#include "gdkmacossurface-private.h"
-
-static void
-gdk_macos_display_user_defaults_changed_cb (CFNotificationCenterRef  center,
-                                            void                    *observer,
-                                            CFStringRef              name,
-                                            const void              *object,
-                                            CFDictionaryRef          userInfo)
-{
-  GdkMacosDisplay *self = observer;
-
-  g_assert (GDK_IS_MACOS_DISPLAY (self));
-
-  _gdk_macos_display_reload_settings (self);
-}
-
-static void
-gdk_macos_display_monitors_changed_cb (CFNotificationCenterRef  center,
-                                       void                    *observer,
-                                       CFStringRef              name,
-                                       const void              *object,
-                                       CFDictionaryRef          userInfo)
-{
-  GdkMacosDisplay *self = observer;
-
-  g_assert (GDK_IS_MACOS_DISPLAY (self));
-
-  _gdk_macos_display_reload_monitors (self);
-
-  /* Now we need to update all our surface positions since they
-   * probably just changed origins.
-   */
-  for (const GList *iter = _gdk_macos_display_get_surfaces (self);
-       iter != NULL;
-       iter = iter->next)
-    {
-      GdkMacosSurface *surface = iter->data;
-
-      g_assert (GDK_IS_MACOS_SURFACE (surface));
-
-      _gdk_macos_surface_monitor_changed (surface);
-    }
-}
-
-
-void
-_gdk_macos_display_feedback_init (GdkMacosDisplay *self)
-{
-  g_return_if_fail (GDK_IS_MACOS_DISPLAY (self));
-
-  CFNotificationCenterAddObserver (CFNotificationCenterGetLocalCenter (),
-                                   self,
-                                   gdk_macos_display_monitors_changed_cb,
-                                   CFSTR ("NSApplicationDidChangeScreenParametersNotification"),
-                                   NULL,
-                                   CFNotificationSuspensionBehaviorDeliverImmediately);
-
-  CFNotificationCenterAddObserver (CFNotificationCenterGetDistributedCenter (),
-                                   self,
-                                   gdk_macos_display_user_defaults_changed_cb,
-                                   CFSTR ("NSUserDefaultsDidChangeNotification"),
-                                   NULL,
-                                   CFNotificationSuspensionBehaviorDeliverImmediately);
-}
-
-void
-_gdk_macos_display_feedback_destroy (GdkMacosDisplay *self)
-{
-  g_return_if_fail (GDK_IS_MACOS_DISPLAY (self));
-
-  CFNotificationCenterRemoveObserver (CFNotificationCenterGetDistributedCenter (),
-                                      self,
-                                      CFSTR ("NSApplicationDidChangeScreenParametersNotification"),
-                                      NULL);
-
-  CFNotificationCenterRemoveObserver (CFNotificationCenterGetDistributedCenter (),
-                                      self,
-                                      CFSTR ("NSUserDefaultsDidChangeNotification"),
-                                      NULL);
-
-}
@@ -43,8 +43,6 @@ G_BEGIN_DECLS
 #define GIC_FILTER_PASSTHRU  0
 #define GIC_FILTER_FILTERED  1

-#define GDK_MACOS_EVENT_DROP (GdkEvent *)GSIZE_TO_POINTER(1)
-
 struct _GdkMacosDisplay
 {
  GdkDisplay parent_instance;
@@ -70,6 +68,16 @@ struct _GdkMacosDisplay
   */
  GQueue sorted_surfaces;

+  /* Our CVDisplayLink based GSource which we use to freeze/thaw the
+   * GdkFrameClock for the surface.
+   */
+  GSource *frame_source;
+
+  /* A queue of surfaces which we know are awaiting frames to be drawn. This
+   * uses the GdkMacosSurface.frame link.
+   */
+  GQueue awaiting_frames;
+
  /* The surface that is receiving keyboard events */
  GdkMacosSurface *keyboard_surface;

@@ -84,14 +92,6 @@ struct _GdkMacosDisplay
  int min_y;
  int max_x;
  int max_y;
-
-  /* A GSource to select a new main/key window */
-  guint select_key_in_idle;
-
-  /* Note if we have a key window that is not a GdkMacosWindow
-   * such as a NSPanel used for native dialogs.
-   */
-  guint key_window_is_foregin : 1;
 };

 struct _GdkMacosDisplayClass
@@ -124,8 +124,6 @@ GdkMonitor      *_gdk_macos_display_get_monitor_at_display_coords  (GdkMacosDisp
                                                                    int              y);
 GdkEvent        *_gdk_macos_display_translate                      (GdkMacosDisplay *self,
                                                                    NSEvent         *event);
-void             _gdk_macos_display_feedback_init                  (GdkMacosDisplay *self);
-void             _gdk_macos_display_feedback_destroy               (GdkMacosDisplay *self);
 void             _gdk_macos_display_break_all_grabs                (GdkMacosDisplay *self,
                                                                    guint32          time);
 GdkModifierType  _gdk_macos_display_get_current_keyboard_modifiers (GdkMacosDisplay *self);
@@ -138,6 +136,10 @@ GdkMacosSurface *_gdk_macos_display_get_surface_at_display_coords  (GdkMacosDisp
 void             _gdk_macos_display_reload_monitors                (GdkMacosDisplay *self);
 void             _gdk_macos_display_surface_removed                (GdkMacosDisplay *self,
                                                                    GdkMacosSurface *surface);
+void             _gdk_macos_display_add_frame_callback             (GdkMacosDisplay *self,
+                                                                    GdkMacosSurface *surface);
+void             _gdk_macos_display_remove_frame_callback          (GdkMacosDisplay *self,
+                                                                    GdkMacosSurface *surface);
 NSWindow        *_gdk_macos_display_find_native_under_pointer      (GdkMacosDisplay *self,
                                                                    int             *x,
                                                                    int             *y);
@@ -153,6 +155,7 @@ void             _gdk_macos_display_surface_resigned_key           (GdkMacosDisp
                                                                    GdkMacosSurface *surface);
 void             _gdk_macos_display_surface_became_key             (GdkMacosDisplay *self,
                                                                    GdkMacosSurface *surface);
+int              _gdk_macos_display_get_nominal_refresh_rate       (GdkMacosDisplay *self);
 void             _gdk_macos_display_clear_sorting                  (GdkMacosDisplay *self);
 const GList     *_gdk_macos_display_get_surfaces                   (GdkMacosDisplay *self);
 void             _gdk_macos_display_send_button_event              (GdkMacosDisplay *self,
@@ -171,10 +174,6 @@ void             _gdk_macos_display_set_drag                       (GdkMacosDisp
 void             _gdk_macos_display_set_drop                       (GdkMacosDisplay *self,
                                                                    NSInteger        sequence_number,
                                                                    GdkDrop         *drop);
-void             _gdk_macos_display_position_surface               (GdkMacosDisplay *self,
-                                                                    GdkMacosSurface *surface,
-                                                                    int             *x,
-                                                                    int             *y);

 G_END_DECLS

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	1cc3c019e6	Include precompiled versions of .ui files These are smaller, and a faster to process than .ui files.	2021-12-14 01:51:22 -05:00
Matthias Clasen	319aa558a5	buildertool: Add a precompile command This writes out the precompiled format of .ui files that we are using internally.	2021-12-14 01:51:22 -05:00