gtkwindow: Change present documentation

The way present is used doesn't line up with the ideal use case, and in most instances a developer won't actually have a timestamp to pass. `present()` is what should be used for cases when you don't have a timestamp, but the current docs have caused a lot of confusion. Instead of saying `present()` shouldn't be used, say when it should be used since there are still valid uses.
2021-10-21 16:28:53 -07:00
816 changed files with 126816 additions and 127819 deletions
@@ -1,32 +0,0 @@
-# SPDX-FileCopyrightText: 2021 The GTK Authors
-# SPDX-License-Identifier: CC0-1.0
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-trim_trailing_whitespace = true
-
-[*.[ch]]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-# For the legacy tabs which still exist in the code:
-tab_width = 8
-
-[*.ui]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-
-[*.xml]
-indent_size = 2
-indent_style = space
-
-[meson.build]
-indent_size = 2
-indent_style = space
-
-[*.md]
-max_line_length = 80
@@ -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,13 +156,9 @@ 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:
+  allow_failure: true
  extends: .only-default
  only:
    - branches@GNOME/gtk
@@ -172,7 +168,7 @@ macos:
  needs: []
  before_script:
    - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson==0.59
+    - pip3 install --user meson==0.56
    - pip3 install --user ninja
    - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
    - export MESON_FORCE_BACKTRACE=1
@@ -226,11 +222,11 @@ vs2017-x64:
  extends: .flatpak-defaults
  when: manual

-# Only build Flatpak bundles automatically on main
-.flatpak-main:
+# Only build Flatpak bundles automatically on master
+.flatpak-master:
  extends: .flatpak-defaults
  only:
-    - main
+    - master

 flatpak-manual:demo:
  extends: .flatpak-manual
@@ -238,8 +234,8 @@ flatpak-manual:demo:
  variables:
    APPID: org.gtk.Demo4

-flatpak-main:demo:
-  extends: .flatpak-main
+flatpak-master:demo:
+  extends: .flatpak-master
  needs: []
  variables:
    APPID: org.gtk.Demo4
@@ -250,8 +246,8 @@ flatpak-manual:widget-factory:
  variables:
    APPID: org.gtk.WidgetFactory4

-flatpak-main:widget-factory:
-  extends: .flatpak-main
+flatpak-master:widget-factory:
+  extends: .flatpak-master
  needs: []
  variables:
    APPID: org.gtk.WidgetFactory4
@@ -262,8 +258,8 @@ flatpak-manual:icon-browser:
  variables:
    APPID: org.gtk.IconBrowser4

-flatpak-main:icon-browser:
-  extends: .flatpak-main
+flatpak-master:icon-browser:
+  extends: .flatpak-master
  needs: []
  variables:
    APPID: org.gtk.IconBrowser4
@@ -273,18 +269,18 @@ flatpak-main:icon-browser:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:demo']
-    needs: ['flatpak-main:demo']
+    dependencies: ['flatpak-master:demo']
+    needs: ['flatpak-master:demo']

 nightly factory:
    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:widget-factory']
-    needs: ['flatpak-main:widget-factory']
+    dependencies: ['flatpak-master:widget-factory']
+    needs: ['flatpak-master:widget-factory']

 nightly icon-browser:
    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:icon-browser']
-    needs: ['flatpak-main:icon-browser']
+    dependencies: ['flatpak-master:icon-browser']
+    needs: ['flatpak-master:icon-browser']

 static-scan:
  image: $FEDORA_IMAGE
@@ -351,4 +347,4 @@ publish-docs:
    - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
  only:
    refs:
-      - main
+      - master
@@ -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
@@ -43,6 +43,6 @@ flatpak build-bundle \
        ${appid}

 # to be consumed by the nightly publish jobs
-if [[ $CI_COMMIT_BRANCH == main ]]; then
+if [[ $CI_COMMIT_BRANCH == master ]]; then
        tar cf repo.tar ${repodir}
 fi
@@ -268,7 +268,7 @@ aparser.add_argument('--job-id', metavar='ID',
                     default=None)
 aparser.add_argument('--branch', metavar='NAME',
                     help='Branch of the project being tested',
-                     default='main')
+                     default='master')
 aparser.add_argument('--output', metavar='FILE',
                     help='The output HTML file, stdout by default',
                     type=argparse.FileType('w', encoding='UTF-8'),
@@ -27,7 +27,7 @@ aparser.add_argument('--job-id', metavar='ID',
                     default='Unknown')
 aparser.add_argument('--branch', metavar='NAME',
                     help='Branch of the project being tested',
-                     default='main')
+                     default='master')
 aparser.add_argument('--output', metavar='FILE',
                     help='The output file, stdout by default',
                     type=argparse.FileType('w', encoding='UTF-8'),
@@ -2,7 +2,7 @@

 set -e

-# We need to add a new remote for the upstream main, since this script could
+# We need to add a new remote for the upstream master, since this script could
 # be running in a personal fork of the repository which has out of date branches.
 if [ "${CI_PROJECT_NAMESPACE}" != "GNOME" ]; then
    echo "Retrieving the current upstream repository from ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}..."
@@ -16,7 +16,7 @@ fi

 # Work out the newest common ancestor between the detached HEAD that this CI job
 # has checked out, and the upstream target branch (which will typically be
-# `upstream/main` or `upstream/gtk-3-24`).
+# `upstream/master` or `upstream/gtk-3-24`).
 #
 # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
 # a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
@@ -36,7 +36,7 @@ exit_status=$?
 echo ""
 echo "Note that clang-format output is advisory and cannot always match the"
 echo "GTK coding style, documented at:"
-echo "   https://gitlab.gnome.org/GNOME/gtk/blob/main/docs/CODING-STYLE"
+echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
 echo "Warnings from this tool can be ignored in favour of the documented "
 echo "coding style, or in favour of matching the style of existing"
 echo "surrounding code."
@@ -5,8 +5,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
@echo on

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

 goto :EOF
@@ -31,8 +31,7 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-pango \
    mingw-w64-$MSYS2_ARCH-fribidi \
    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-python-gobject
+    mingw-w64-$MSYS2_ARCH-shared-mime-info

 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -49,7 +48,7 @@ if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
 fi
 pkg-config --modversion glib-2.0

-if ! pkg-config --atleast-version=1.50.0 pango; then
+if ! pkg-config --atleast-version=1.49.1 pango; then
    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
    meson setup _pango_build _pango
    meson compile -C _pango_build
@@ -73,5 +72,3 @@ unset CCACHE_DISABLE

 ninja -C _build
 ccache --show-stats
-
-tar zcf _build/gtkdll.tar.gz _build/gtk/libgtk*.dll
@@ -1,7 +1,7 @@
 <!--
  Please, read the CONTRIBUTING.md guide on how to file a new issue.

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

-  https://gitlab.gnome.org/GNOME/gtk/-/blob/main/CONTRIBUTING.md
+  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
 -->

 ## Steps to reproduce
@@ -256,7 +256,7 @@ people committing to GTK to follow a few rules:
 0. Always write a meaningful commit message. Changes without a sufficient
   commit message will be reverted.

-0. Never push to the `main` branch, or any stable branches, directly; you
+0. Never push to the `master` branch, or any stable branches, directly; you
   should always go through a merge request, to ensure that the code is
   tested on the CI infrastructure at the very least. A merge request is
   also the proper place to get a comprehensive code review from the core
@@ -1,318 +1,19 @@
-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.
-
-* 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
-============================
+Overview of Changes
+===================

 * gsk:
 - Drop the GL renderer in favor of NGL
- - Rename NGL to GL
- - Fix some coordinate overflow issues
- - Reimplement texture upload and download for better
-   support of image formats and color spaces
- - New api:
-   gsk_transform_skew
-   gsk_transform_to_2d_components
-
-* gdk:
- - Support HSL in gdk_rgba_parse
- - Use libpng, libjpeg and libtiff directly when loading
-   textures, and support more image formats (including 16bit
-   and float formats)
- - New apis:
-   gdk_texture_new_from_bytes
-   gdk_texture_new_from_filename
-   gdk_texture_download_float
-   gdk_texture_save_to_png_bytes
-   gdk_texture_save_to_tiff
-   gdk_texture_save_to_tiff_bytes
-   gdk_display_create_gl_context
- - Implement GIcon and GLoadableIcon in GdkTexture
- - Move EGL initialization to the frontend
- - Use configless EGL contexts, if supported
- - Use >8bit pixel formats, if supported and requested

 * css:
 - Add support for line-height
 - Add support for text-transform

-* theme:
- - Fixes for buttons in toolbars
-
-* input:
- - Update compose sequences from libX11 1.7.2
- - Accept replacement string longer than 20 characters
-
-* text:
- - Implement sloped caret drawing
- - Add a gtk-hint-font-metrics setting to switch
-   font rendering to be more similar to GTK3
-
 * GtkTextView:
 - Add support for line height
 - Add support for text transforms
- - Misc fixes for css->pango attribute translations
- - Invalidate pango contexts when font settings change
- - Improve undo grouping when overwriting
-
-* GtkListView:
- - Make tree indentation more flexible with
-   GtkTreeExpander:indent-for-icon
-
-* GtkMenuButton:
- - Support custom children
-
-* GtkFlowBox:
- - Add prepend and append
-
-* GtkCalendar:
- - Fix handling of weeks starting on Monday
-
-* GtkWindow:
- - Add a titlebar property
-
-* GtkDropDown:
- - Add a show-arrow property
-
-* GtkPopoverMenu:
- - Support a use-markup attribute in menu models
-
-* Add GtkSymbolicPaintable
-
-* Tools:
- - Support DND in gtk4-node-editor and the inspector's recorder
-
-* Demos:
- - Improve the font rendering demo

 * Build:
 - Require Pango 1.49
- - Require libpng, libtiff and libjpeg
- - Speed up handling of resources during build
-
-* X11:
- - Support touchpad gestures with XInput 2.4
-
-* Windows:
- - Fix DND coordinates
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Chinese (China)
- Croatian
- Czech
- Dutch
- Finnish
- French
- Galician
- German
- Hebrew
- Hungarian
- Icelandic
- Indonesian
- Kazakh
- Korean
- Latvian
- Lithuanian
- Persian
- Portuguese
- Romanian
- Serbian
- Slovak
- Spanish
- Swedish
- Turkish
- Ukrainian


 Overview of Changes in 4.4.0
@@ -1,7 +1,7 @@
 GTK — The GTK toolkit
 =====================

-[![Build status](https://gitlab.gnome.org/GNOME/gtk/badges/main/pipeline.svg)](https://gitlab.gnome.org/GNOME/gtk/-/commits/main)
+[![Build status](https://gitlab.gnome.org/GNOME/gtk/badges/master/pipeline.svg)](https://gitlab.gnome.org/GNOME/gtk/-/commits/master)

 General information
 -------------------
@@ -40,7 +40,7 @@ Nightly documentation can be found at

 Nightly flatpaks of our demos can be installed from the
 [GNOME Nightly](https://wiki.gnome.org/Apps/Nightly) repository:
-  - `flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo`
+  - `flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo` 
  - `flatpak install gnome-nightly org.gtk.Demo4`
  - `flatpak install gnome-nightly org.gtk.WidgetFactory4`
  - `flatpak install gnome-nightly org.gtk.IconBrowser4`
@@ -114,21 +114,7 @@ can be found in the file:
 docs/reference/gtk/html/gtk-building.html
 ```

-Or [online](https://docs.gtk.org/gtk4/building.html)
-
-Default branch renamed to `main`
--------------------------------
-
-The default development branch of GTK has been renamed to `main`.
-To update your local checkout, use:
-```sh
-git checkout master
-git branch -m master main
-git fetch
-git branch --unset-upstream
-git branch -u origin/main
-git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
-```
+Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)

 How to report bugs
 ------------------
@@ -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"
                }
            ]
        },
@@ -165,21 +164,6 @@
                }
            ]
        },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
        {
            "name" : "gtk",
            "buildsystem" : "meson",
@@ -193,8 +177,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.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"
                }
            ]
        },
@@ -94,21 +93,6 @@
                }
            ]
        },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
        {
            "name" : "gtk",
            "buildsystem" : "meson",
@@ -122,8 +106,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.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"
                }
            ]
        },
@@ -94,21 +93,6 @@
                }
            ]
        },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
        {
            "name" : "gtk",
            "buildsystem" : "meson",
@@ -122,8 +106,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.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,
 )
@@ -1,10 +1,12 @@
 /* Clipboard
 *
 * GdkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text, images, colors or files to and from the clipboard.
+ * copy and paste text to and from the clipboard.
 *
- * You can also use Drag-And-Drop to copy the data from the source to the
- * target.
+ * It also shows how to transfer images via the clipboard or via
+ * drag-and-drop, and how to make clipboard contents persist after
+ * the application exits. Clipboard persistence requires a clipboard
+ * manager to run.
 */

 #include <glib/gi18n.h>
@@ -12,103 +14,22 @@
 #include <string.h>
 #include "demoimage.h"

+static GtkWidget *window = NULL;
+
 static void
-copy_button_clicked (GtkStack *source_stack,
-                     gpointer  user_data)
+copy_button_clicked (GtkWidget *button,
+                     gpointer   user_data)
 {
+  GtkWidget *entry;
  GdkClipboard *clipboard;
-  const char *visible_child_name;
-  GtkWidget *visible_child;

-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (source_stack));
+  entry = GTK_WIDGET (user_data);

-  visible_child = gtk_stack_get_visible_child (source_stack);
-  visible_child_name = gtk_stack_get_visible_child_name (source_stack);
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry);

-  if (strcmp (visible_child_name, "Text") == 0)
-    {
-      gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (visible_child)));
-    }
-  else if (strcmp (visible_child_name, "Image") == 0)
-    {
-      GtkWidget *child;
-
-      for (child = gtk_widget_get_first_child (visible_child); child; child = gtk_widget_get_next_sibling (child))
-        {
-          if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (child)))
-            {
-              GtkWidget *image = gtk_widget_get_first_child (child);
-              GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-              if (GDK_IS_TEXTURE (paintable))
-                gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, paintable);
-              else
-                gdk_clipboard_set (clipboard, GDK_TYPE_PAINTABLE, paintable);
-              break;
-            }
-        }
-    }
-  else if (strcmp (visible_child_name, "Color") == 0)
-    {
-      GdkRGBA color;
-
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (visible_child), &color);
-      gdk_clipboard_set (clipboard, GDK_TYPE_RGBA, &color);
-    }
-  else if (strcmp (visible_child_name, "File") == 0)
-    {
-      gdk_clipboard_set (clipboard, G_TYPE_FILE, g_object_get_data (G_OBJECT (visible_child), "file"), NULL);
-    }
-  else
-    {
-      g_print ("TODO");
-    }
-}
-
-static void
-present_value (GtkStack     *dest_stack,
-               const GValue *value)
-{
-  GtkWidget *child;
-
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      GFile *file;
-
-      gtk_stack_set_visible_child_name (dest_stack, "File");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      file = g_value_get_object (value);
-      g_object_set (child, "label", g_file_peek_path (file), NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_RGBA))
-    {
-      GdkRGBA *color;
-
-      gtk_stack_set_visible_child_name (dest_stack, "Color");
-      child = gtk_widget_get_first_child (gtk_stack_get_visible_child (dest_stack));
-
-      color = g_value_get_boxed (value);
-      g_object_set (child, "rgba", color, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_TEXTURE) ||
-           G_VALUE_HOLDS (value, GDK_TYPE_PAINTABLE))
-    {
-      GdkPaintable *paintable;
-
-      gtk_stack_set_visible_child_name (dest_stack, "Image");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      paintable = g_value_get_object (value);
-      g_object_set (child, "paintable", paintable, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, G_TYPE_STRING))
-    {
-      gtk_stack_set_visible_child_name (dest_stack, "Text");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      gtk_label_set_label (GTK_LABEL (child), g_value_get_string (value));
-    }
+  /* Set clipboard text */
+  gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (entry)));
 }

 static void
@@ -116,259 +37,149 @@ paste_received (GObject      *source_object,
                GAsyncResult *result,
                gpointer      user_data)
 {
-  GtkStack *dest_stack = user_data;
  GdkClipboard *clipboard;
-  const GValue *value;
+  GtkWidget *entry;
+  char *text;
  GError *error = NULL;

  clipboard = GDK_CLIPBOARD (source_object);
+  entry = GTK_WIDGET (user_data);

-  value = gdk_clipboard_read_value_finish (clipboard, result, &error);
-  if (value)
+  /* Get the resulting text of the read operation */
+  text = gdk_clipboard_read_text_finish (clipboard, result, &error);
+
+  if (text)
    {
-      present_value (dest_stack, value);
+      /* Set the entry text */
+      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      g_free (text);
    }
  else
    {
-      g_print ("%s\n", error->message);
+      GtkWidget *dialog;
+
+      /* Show an error about why pasting failed.
+       * Usually you probably want to ignore such failures,
+       * but for demonstration purposes, we show the error.
+       */
+      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       "Could not paste text: %s",
+                                       error->message);
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_window_destroy), NULL);
+      gtk_widget_show (dialog);
+
      g_error_free (error);
    }
 }

 static void
-paste_button_clicked (GtkStack *dest_stack,
-                      gpointer  user_data)
+paste_button_clicked (GtkWidget *button,
+                      gpointer   user_data)
 {
+  GtkWidget *entry;
  GdkClipboard *clipboard;
-  GdkContentFormats *formats;

-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (dest_stack));
-  formats = gdk_clipboard_get_formats (clipboard);
+  entry = GTK_WIDGET (user_data);

-  if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_TEXTURE))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_TEXTURE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_PAINTABLE))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_PAINTABLE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_RGBA))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_RGBA, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, G_TYPE_FILE))
-    gdk_clipboard_read_value_async (clipboard, G_TYPE_FILE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, G_TYPE_STRING))
-    gdk_clipboard_read_value_async (clipboard, G_TYPE_STRING, 0, NULL, paste_received, dest_stack);
-}
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry);

-static void
-update_copy_button_sensitivity (GtkWidget *source_stack)
-{
-  GtkButton *copy_button;
-  const char *visible_child_name;
-  GtkWidget *visible_child;
-  gboolean sensitive;
-
-  copy_button = GTK_BUTTON (g_object_get_data (G_OBJECT (source_stack), "copy-button"));
-
-  visible_child = gtk_stack_get_visible_child (GTK_STACK (source_stack));
-  visible_child_name = gtk_stack_get_visible_child_name (GTK_STACK (source_stack));
-  if (strcmp (visible_child_name, "Text") == 0)
-    {
-      sensitive = strlen (gtk_editable_get_text (GTK_EDITABLE (visible_child))) > 0;
-    }
-  else if (strcmp (visible_child_name, "Color") == 0 ||
-           strcmp (visible_child_name, "Image") == 0)
-    {
-      sensitive = TRUE;
-    }
-  else if (strcmp (visible_child_name, "File") == 0)
-    {
-      sensitive = g_object_get_data (G_OBJECT (visible_child), "file") != NULL;
-    }
-  else
-    {
-      sensitive = FALSE;
-    }
-
-  gtk_widget_set_sensitive (GTK_WIDGET (copy_button), sensitive);
-}
-
-static void
-source_changed_cb (GtkButton  *copy_button,
-                   GParamSpec *pspec,
-                   GtkWidget  *source_stack)
-{
-  update_copy_button_sensitivity (source_stack);
-}
-
-static void
-text_changed_cb (GtkButton  *copy_button,
-                 GParamSpec *pspec,
-                 GtkWidget  *entry)
-{
-  update_copy_button_sensitivity (gtk_widget_get_ancestor (entry, GTK_TYPE_STACK));
-}
-
-static void
-file_button_set_file (GtkButton *button,
-                      GFile     *file)
-{
-  gtk_label_set_label (GTK_LABEL (gtk_button_get_child (button)), g_file_peek_path (file));
-  g_object_set_data_full (G_OBJECT (button), "file", g_object_ref (file), g_object_unref);
-}
-
-static void
-file_chooser_response (GtkNativeDialog *dialog,
-                       int              response,
-                       GtkButton       *button)
-{
-  gtk_native_dialog_hide (dialog);
-
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-      file_button_set_file (button, file);
-      g_object_unref (file);
-
-      update_copy_button_sensitivity (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_STACK));
-    }
-
-  gtk_native_dialog_destroy (dialog);
-}
-
-static void
-open_file_cb (GtkWidget *button)
-{
-  GtkFileChooserNative *chooser;
-
-  chooser = gtk_file_chooser_native_new ("Choose a file",
-                                         GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
-                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                         "_Open",
-                                         "_Cancel");
-
-  g_signal_connect (chooser, "response", G_CALLBACK (file_chooser_response), button);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (chooser));
-}
-
-static void
-update_paste_button_sensitivity (GdkClipboard *clipboard,
-                                 GtkWidget    *paste_button)
-{
-  GdkContentFormats *formats;
-  gboolean sensitive = FALSE;
-
-  formats = gdk_clipboard_get_formats (clipboard);
-
-  if (gdk_content_formats_contain_gtype (formats, G_TYPE_FILE) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_RGBA) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_TEXTURE) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_PAINTABLE) ||
-      gdk_content_formats_contain_gtype (formats, G_TYPE_STRING))
-    sensitive = TRUE;
-
-  gtk_widget_set_sensitive (paste_button, sensitive);
-}
-
-static void
-unset_clipboard_handler (gpointer data)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-
-  g_signal_handlers_disconnect_by_func (clipboard, update_paste_button_sensitivity, data);
-}
-
-static gboolean
-on_drop (GtkStack      *dest_stack,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  present_value (dest_stack, value);
-  return TRUE;
-}
-
-static GdkContentProvider *
-drag_prepare (GtkDragSource *drag_source,
-              double         x,
-              double         y,
-              gpointer       data)
-{
-  GtkWidget *button;
-  GValue value = G_VALUE_INIT;
-
-  button = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (drag_source));
-
-  if (GTK_IS_TOGGLE_BUTTON (button))
-    {
-      GtkWidget *image = gtk_widget_get_first_child (button);
-      GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-      if (GDK_IS_TEXTURE (paintable))
-        {
-          g_value_init (&value, GDK_TYPE_TEXTURE);
-          g_value_set_object (&value, paintable);
-        }
-      else
-        {
-          g_value_init (&value, GDK_TYPE_PAINTABLE);
-          g_value_set_object (&value, paintable);
-        }
-    }
-  else
-    {
-      GFile *file = g_object_get_data (G_OBJECT (button), "file");
-
-      if (file)
-        {
-          g_value_init (&value, G_TYPE_FILE);
-          g_value_set_object (&value, file);
-        }
-      else
-        return NULL;
-    }
-
-  return gdk_content_provider_new_for_value (&value);
+  /* Request the contents of the clipboard, contents_received will be
+     called when we do get the contents.
+   */
+  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
 }

 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
-  static GtkWidget *window = NULL;
-
  if (!window)
    {
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GtkWidget *button;
+      GtkWidget *vbox, *hbox;
+      GtkWidget *label;
+      GtkWidget *entry, *button;
+      GtkWidget *image;

-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-                                               "copy_button_clicked", G_CALLBACK (copy_button_clicked),
-                                               "paste_button_clicked", G_CALLBACK (paste_button_clicked),
-                                               "source_changed_cb", G_CALLBACK (source_changed_cb),
-                                               "text_changed_cb", G_CALLBACK (text_changed_cb),
-                                               "open_file_cb", G_CALLBACK (open_file_cb),
-                                               "on_drop", G_CALLBACK (on_drop),
-                                               "drag_prepare", G_CALLBACK (drag_prepare),
-                                               NULL);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/clipboard/clipboard.ui", NULL);
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      window = gtk_window_new ();
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));

-      button = GTK_WIDGET (gtk_builder_get_object (builder, "copy_button"));
-      g_object_set_data (gtk_builder_get_object (builder, "source_stack"), "copy-button", button);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_widget_set_margin_start (vbox, 8);
+      gtk_widget_set_margin_end (vbox, 8);
+      gtk_widget_set_margin_top (vbox, 8);
+      gtk_widget_set_margin_bottom (vbox, 8);

-      button = GTK_WIDGET (gtk_builder_get_object (builder, "paste_button"));
-      g_signal_connect (gtk_widget_get_clipboard (button), "changed",
-                        G_CALLBACK (update_paste_button_sensitivity), button);
-      g_object_set_data_full (G_OBJECT (button), "clipboard-handler", button, unset_clipboard_handler);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);

-      g_object_unref (builder);
-      g_object_unref (scope);
+      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
+
+      gtk_box_append (GTK_BOX (vbox), label);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
+
+      /* Create the first entry */
+      entry = gtk_entry_new ();
+      gtk_box_append (GTK_BOX (hbox), entry);
+
+      /* Create the button */
+      button = gtk_button_new_with_mnemonic (_("_Copy"));
+      gtk_box_append (GTK_BOX (hbox), button);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (copy_button_clicked), entry);
+
+      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
+      gtk_box_append (GTK_BOX (vbox), label);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
+
+      /* Create the second entry */
+      entry = gtk_entry_new ();
+      gtk_box_append (GTK_BOX (hbox), entry);
+
+      /* Create the button */
+      button = gtk_button_new_with_mnemonic (_("_Paste"));
+      gtk_box_append (GTK_BOX (hbox), button);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (paste_button_clicked), entry);
+
+      label = gtk_label_new ("Images can be transferred via the clipboard, too");
+      gtk_box_append (GTK_BOX (vbox), label);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
+
+      /* Create the first image */
+      image = demo_image_new ("dialog-warning");
+      gtk_box_append (GTK_BOX (hbox), image);
+
+      /* Create the second image */
+      image = demo_image_new ("process-stop");
+      gtk_box_append (GTK_BOX (hbox), image);
+
+      /* Create the third image */
+      image = demo_image_new ("weather-clear");
+      gtk_box_append (GTK_BOX (hbox), image);
    }

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

 #include <gtk/gtk.h>
+#include <pango/pangofc-font.h>
 #include <hb.h>
 #include <hb-ot.h>
 #include <glib/gi18n.h>
@@ -874,8 +874,8 @@ gtk_gears_tick (GtkWidget     *widget,
 {
  GtkGears *gears = GTK_GEARS (widget);
  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-  GdkFrameTimings *previous_timings;
-  gint64 previous_frame_time;
+  GdkFrameTimings *timings, *previous_timings;
+  gint64 previous_frame_time = 0;
  gint64 frame_time;
  gint64 history_start, history_len;
  gint64 frame;
@@ -915,6 +915,12 @@ gtk_gears_tick (GtkWidget     *widget,
        }
    }

+  timings = gdk_frame_clock_get_current_timings (frame_clock);
+  previous_timings = gdk_frame_clock_get_timings (frame_clock,
+                                                  gdk_frame_timings_get_frame_counter (timings) - 1);
+  if (previous_timings != NULL)
+    previous_frame_time = gdk_frame_timings_get_frame_time (previous_timings);
+
  return G_SOURCE_CONTINUE;
 }

@@ -7,8 +7,7 @@
 * shows.
 *
 * We also demonstrate adding other things to a text view, such as
- * clickable icons and widgets which can also replace a character
- * (try copying the ghost text).
+ * clickable icons.
 */

 #include <gtk/gtk.h>
@@ -95,12 +94,13 @@ show_page (GtkTextView *text_view,
      gtk_text_buffer_insert (buffer, &iter, " can easily be realized with ", -1);
      insert_link (buffer, &iter, "tags", 2);
      gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
-      gtk_text_buffer_insert (buffer, &iter, "Of course you can also embed Emoji 😋, ", -1);
-      gtk_text_buffer_insert (buffer, &iter, "icons ", -1);
+      gtk_text_buffer_insert (buffer, &iter,
+          "Of course you can also embed Emoji 😋, "
+          "icons ", -1);

      theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (text_view)));
      icon = gtk_icon_theme_lookup_icon (theme,
-                                         "eye-not-looking-symbolic",
+                                         "microphone-sensitivity-high-symbolic",
                                         NULL,
                                         16,
                                         1,
@@ -114,12 +114,7 @@ show_page (GtkTextView *text_view,
      gtk_level_bar_set_value (GTK_LEVEL_BAR (child), 50);
      gtk_widget_set_size_request (child, 100, -1);
      gtk_text_view_add_child_at_anchor (text_view, child, anchor);
-      gtk_text_buffer_insert (buffer, &iter, " and labels with ", -1);
-      anchor = gtk_text_child_anchor_new_with_replacement ("👻");
-      gtk_text_buffer_insert_child_anchor (buffer, &iter, anchor);
-      child = gtk_label_new ("ghost");
-      gtk_text_view_add_child_at_anchor (text_view, child, anchor);
-      gtk_text_buffer_insert (buffer, &iter, " text.", -1);
+      gtk_text_buffer_insert (buffer, &iter, ".", -1);
    }
  else if (page == 2)
    {
@@ -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 *
@@ -192,7 +192,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -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>
@@ -98,7 +98,6 @@ demos = files([
  'transparent.c',
  'tree_store.c',
  'video_player.c',
-  'font_features.c',
 ])

 gtkdemo_deps = [ libgtk_dep, ]
@@ -129,14 +128,19 @@ extra_demo_sources = files([
  'script-names.c',
  'unicode-names.c',
  'suggestionentry.c',
-  'language-names.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

-librsvg_dep = dependency('librsvg-2.0', version: '>= 2.52.0', required: false)
+librsvg_dep = dependency('librsvg-2.0', version: '>= 2.46.0', required: false)

 if librsvg_dep.found()
  demos += files('paintable_svg.c')
@@ -160,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
@@ -170,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(),
@@ -184,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(),
@@ -198,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@',
@@ -209,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@'])
@@ -228,9 +228,7 @@ endif
 # Use a subset of compiler flags
 demo_cflags = []
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations',
-                  '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
    demo_cflags += flag
  endif
 endforeach
@@ -242,7 +240,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,
 )
@@ -252,7 +250,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,
 )
@@ -47,24 +47,22 @@ static int
 svg_paintable_get_intrinsic_width (GdkPaintable *paintable)
 {
  SvgPaintable *self = SVG_PAINTABLE (paintable);
-  double width;
+  RsvgDimensionData data;

-  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, &width, NULL))
-    return 0;
+  rsvg_handle_get_dimensions (self->handle, &data);

-  return ceil (width);
+  return data.width;
 }

 static int
 svg_paintable_get_intrinsic_height (GdkPaintable *paintable)
 {
  SvgPaintable *self = SVG_PAINTABLE (paintable);
-  double height;
+  RsvgDimensionData data;

-  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, NULL, &height))
-    return 0;
+  rsvg_handle_get_dimensions (self->handle, &data);

-  return ceil (height);
+  return data.height;
 }

 static void
@@ -1,11 +1,6 @@
 /* Text View/Tabs
 *
 * GtkTextView can position text at fixed positions, using tabs.
- * Tabs can specify alignment, and also allow aligning numbers
- * on the decimal point.
- *
- * The example here has three tabs, with left, numeric and right
- * alignment.
 */

 #include <gtk/gtk.h>
@@ -27,7 +22,7 @@ do_tabs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Tabs");
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 330, 130);
+      gtk_window_set_default_size (GTK_WINDOW (window), 330, 330);
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

@@ -40,18 +35,17 @@ do_tabs (GtkWidget *do_widget)

      tabs = pango_tab_array_new (3, TRUE);
      pango_tab_array_set_tab (tabs, 0, PANGO_TAB_LEFT, 0);
-      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_DECIMAL, 150);
-      pango_tab_array_set_decimal_point (tabs, 1, '.');
-      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_RIGHT, 290);
+      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_LEFT, 100);
+      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_LEFT, 200);
      gtk_text_view_set_tabs (GTK_TEXT_VIEW (view), tabs);
      pango_tab_array_free (tabs);

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_text (buffer, "one\t2.0\tthree\nfour\t5.555\tsix\nseven\t88.88\tnine", -1);
+      gtk_text_buffer_set_text (buffer, "one\ttwo\tthree\nfour\tfive\tsix\nseven\teight\tnine", -1);

      sw = gtk_scrolled_window_new ();
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
      gtk_window_set_child (GTK_WINDOW (window), sw);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
@@ -72,7 +72,7 @@ about_activated (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -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,
 )
@@ -79,7 +79,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -336,39 +336,12 @@ text_view_query_tooltip_cb (GtkWidget        *widget,
    }
 }

-static gboolean
-load_bytes (NodeEditorWindow *self,
-            GBytes           *bytes);
-
-static void
-load_error (NodeEditorWindow *self,
-            const char        *error_message)
-{
-  PangoLayout *layout;
-  GtkSnapshot *snapshot;
-  GskRenderNode *node;
-  GBytes *bytes;
-
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), error_message);
-  pango_layout_set_width (layout, 300 * PANGO_SCALE);
-  snapshot = gtk_snapshot_new ();
-  gtk_snapshot_append_layout (snapshot, layout, &(GdkRGBA) { 0.7, 0.13, 0.13, 1.0 });
-  node = gtk_snapshot_free_to_node (snapshot);
-  bytes = gsk_render_node_serialize (node);
-
-  load_bytes (self, bytes);
-
-  gsk_render_node_unref (node);
-  g_object_unref (layout);
-}
-
 static gboolean
 load_bytes (NodeEditorWindow *self,
            GBytes           *bytes)
 {
  if (!g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
    {
-      load_error (self, "Invalid UTF-8");
      g_bytes_unref (bytes);
      return FALSE;
    }
@@ -386,16 +359,11 @@ static gboolean
 load_file_contents (NodeEditorWindow *self,
                    GFile            *file)
 {
-  GError *error = NULL;
  GBytes *bytes;

-  bytes = g_file_load_bytes (file, NULL, NULL, &error);
+  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
  if (bytes == NULL)
-    {
-      load_error (self, error->message);
-      g_clear_error (&error);
-      return FALSE;
-    }
+    return FALSE;

  return load_bytes (self, bytes);
 }
@@ -505,18 +473,17 @@ node_editor_window_load (NodeEditorWindow *self,
 {
  GError *error = NULL;

-  g_clear_object (&self->file_monitor);
-
  if (!load_file_contents (self, file))
    return FALSE;

+  g_clear_object (&self->file_monitor);
  self->file_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);

+
  if (error)
    {
      g_warning ("couldn't monitor file: %s", error->message);
      g_error_free (error);
-      g_clear_object (&self->file_monitor);
    }
  else
    {
@@ -161,10 +161,9 @@
    </child>
    <child>
      <object class="GtkPaned">
-        <property name="shrink-start-child">false</property>
        <property name="shrink-end-child">false</property>
        <property name="position">400</property>
-        <property name="start-child">
+        <child>
          <object class="GtkScrolledWindow">
            <property name="hscrollbar-policy">never</property>
            <property name="hexpand">1</property>
@@ -185,8 +184,8 @@
              </object>
            </child>
          </object>
-        </property>
-        <property name="end-child">
+        </child>
+        <child>
          <object class="GtkBox">
            <child>
              <object class="GtkScrolledWindow">
@@ -232,7 +231,7 @@
              </object>
            </child>
          </object>
-        </property>
+        </child>
      </object>
    </child>
  </template>
@@ -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,
 )
@@ -42,7 +42,7 @@ update_statusbar (void)
  const char *print_str;

  gtk_statusbar_pop (GTK_STATUSBAR (statusbar), 0);
-
+  
  gtk_text_buffer_get_iter_at_mark (buffer,
                                    &iter,
                                    gtk_text_buffer_get_insert (buffer));
@@ -56,7 +56,7 @@ update_statusbar (void)
      GtkPrintOperation *op = active_prints->data;
      print_str = gtk_print_operation_get_status_string (op);
    }
-
+  
  msg = g_strdup_printf ("%d, %d%s %s",
                         row, col,
 			 file_changed?" - Modified":"",
@@ -188,10 +188,10 @@ save_file (GFile *save_filename)
 					     "Error saving to file %s:\n%s",
 					     display_name,
 					     error->message);
-
+      
      g_signal_connect (error_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
      gtk_widget_show (error_dialog);
-
+      
      g_error_free (error);
      g_object_unref (info);
    }
@@ -229,7 +229,7 @@ begin_print (GtkPrintOperation *operation,
  pango_font_description_free (desc);

  pango_layout_set_width (print_data->layout, width * PANGO_SCALE);
-
+  
  pango_layout_set_text (print_data->layout, print_data->text, -1);

  num_lines = pango_layout_get_line_count (print_data->layout);
@@ -241,7 +241,7 @@ begin_print (GtkPrintOperation *operation,
    {
      PangoRectangle ink_rect, logical_rect;
      double line_height;
-
+      
      layout_line = pango_layout_get_line (print_data->layout, line);
      pango_layout_line_get_extents (layout_line, &ink_rect, &logical_rect);

@@ -258,7 +258,7 @@ begin_print (GtkPrintOperation *operation,

  page_breaks = g_list_reverse (page_breaks);
  gtk_print_operation_set_n_pages (operation, g_list_length (page_breaks) + 1);
-
+  
  print_data->page_breaks = page_breaks;
 }

@@ -287,11 +287,11 @@ draw_page (GtkPrintOperation *operation,
    end = pango_layout_get_line_count (print_data->layout);
  else
    end = GPOINTER_TO_INT (pagebreak->data);
-
+    
  cr = gtk_print_context_get_cairo_context (context);

  cairo_set_source_rgb (cr, 0, 0, 0);
-
+  
  i = 0;
  start_pos = 0;
  iter = pango_layout_get_iter (print_data->layout);
@@ -307,12 +307,12 @@ draw_page (GtkPrintOperation *operation,

 	  pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
 	  baseline = pango_layout_iter_get_baseline (iter);
-
+	  
 	  if (i == start)
 	    start_pos = logical_rect.y / 1024.0;
-
+	  
 	  cairo_move_to (cr, logical_rect.x / 1024.0, baseline / 1024.0 - start_pos);
-
+	  
 	  pango_cairo_show_layout_line  (cr, line);
 	}
      i++;
@@ -383,9 +383,9 @@ print_done (GtkPrintOperation *op,
    {

      GtkWidget *error_dialog;
-
+      
      gtk_print_operation_get_error (op, &error);
-
+      
      error_dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
 					     GTK_DIALOG_DESTROY_WITH_PARENT,
 					     GTK_MESSAGE_ERROR,
@@ -405,13 +405,13 @@ print_done (GtkPrintOperation *op,
  g_free (print_data->text);
  g_free (print_data->font);
  g_free (print_data);
-
+  
  if (!gtk_print_operation_is_finished (op))
    {
      g_object_ref (op);
      active_prints = g_list_append (active_prints, op);
      update_statusbar ();
-
+      
      /* This ref is unref:ed when we get the final state change */
      g_signal_connect (op, "status_changed",
 			G_CALLBACK (status_changed_cb), NULL);
@@ -628,7 +628,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (sysinfo, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (sysinfo, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (sysinfo, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -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,
 )
@@ -78,21 +78,6 @@ change_theme_state (GSimpleAction *action,
                NULL);
 }

-static void
-change_fullscreen (GSimpleAction *action,
-                   GVariant      *state,
-                   gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-
-  if (g_variant_get_boolean (state))
-    gtk_window_fullscreen (window);
-  else
-    gtk_window_unfullscreen (window);
-
-  g_simple_action_set_state (action, state);
-}
-
 static GtkWidget *page_stack;

 static void
@@ -298,7 +283,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -399,7 +384,7 @@ print_operation_done (GtkPrintOperation       *op,
      g_clear_error (&error);
      break;
    case GTK_PRINT_OPERATION_RESULT_APPLY:
-      break;
+      break; 
    case GTK_PRINT_OPERATION_RESULT_CANCEL:
      g_print ("Printing was canceled\n");
      break;
@@ -2027,12 +2012,11 @@ activate (GApplication *app)
  GMenuModel *model;
  static GActionEntry win_entries[] = {
    { "dark", NULL, NULL, "false", change_dark_state },
-    { "theme", NULL, "s", "'current'", change_theme_state },
+    { "theme", NULL, "s", "'current'", change_theme_state }, 
    { "transition", NULL, NULL, "true", change_transition_state },
    { "search", activate_search, NULL, NULL, NULL },
    { "delete", activate_delete, NULL, NULL, NULL },
    { "busy", get_busy, NULL, NULL, NULL },
-    { "fullscreen", NULL, NULL, "false", change_fullscreen },
    { "background", activate_background, NULL, NULL, NULL },
    { "open", activate_open, NULL, NULL, NULL },
    { "record", activate_record, NULL, NULL, NULL },
@@ -2053,7 +2037,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;
@@ -2199,7 +2182,7 @@ activate (GApplication *app)
  g_object_set_data (G_OBJECT (window), "searchbar", widget);

  widget = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
-  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL);
+  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL); 
  g_object_set_data (G_OBJECT (window), "infobar", widget);

  dialog = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");
@@ -2360,7 +2343,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);
 }
@@ -6,10 +6,6 @@
        <attribute name="label" translatable="yes">Get Busy</attribute>
        <attribute name="action">win.busy</attribute>
      </item>
-      <item>
-        <attribute name="label" translatable="yes">Fullscreen</attribute>
-        <attribute name="action">win.fullscreen</attribute>
-      </item>
      <submenu>
        <attribute name="label" translatable="yes">Style</attribute>
        <section>
@@ -1927,12 +1923,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>
@@ -2933,7 +2923,7 @@ microphone-sensitivity-medium-symbolic</property>
    <property name="resizable">0</property>
    <property name="modal">1</property>
    <property name="text" translatable="1">Do something?</property>
-    <property name="secondary-text" translatable="1">If you don't do something,
+    <property name="secondary-text" translatable="1">If you do something,
 bad things might happen.</property>
    <property name="hide-on-close">1</property>
    <child type="action">
@@ -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 = [
@@ -3,12 +3,11 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
 repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
-docs_url = "https://docs.gtk.org/gdk4/"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 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 +16,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 +26,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 +42,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 = [
@@ -33,7 +33,7 @@ calls to different backends, and error out on unsupported windowing systems:
  else
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (display))
+  if (GTK_IS_WAYLAND_DISPLAY (display))
    {
      // make Wayland-specific calls here
    }
@@ -16,10 +16,12 @@ if get_option('gtk_doc')
    command: [
      gidocgen,
      'generate',
-      gidocgen_common_args,
+      '--quiet',
+      '--fatal-warnings',
      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
      '--config=@INPUT0@',
      '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
      '--content-dir=@0@'.format(meson.current_source_dir()),
      '@INPUT1@',
    ],
@@ -44,10 +46,12 @@ if get_option('gtk_doc')
      command: [
        gidocgen,
        'generate',
-        gidocgen_common_args,
+        '--quiet',
+        '--fatal-warnings',
        '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
        '--config=@INPUT0@',
        '--output-dir=@OUTPUT@',
+        '--no-namespace-dir',
        '--content-dir=@0@'.format(meson.current_source_dir()),
        '@INPUT1@',
      ],
@@ -74,10 +78,12 @@ if get_option('gtk_doc')
      command: [
        gidocgen,
        'generate',
-        gidocgen_common_args,
+        '--quiet',
+        '--fatal-warnings',
        '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
        '--config=@INPUT0@',
        '--output-dir=@OUTPUT@',
+        '--no-namespace-dir',
        '--content-dir=@0@'.format(meson.current_source_dir()),
        '@INPUT1@',
      ],
@@ -23,7 +23,7 @@ calls to different backends, and error out on unsupported windowing systems:
 #endif

 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (display))
+  if (GTK_IS_WAYLAND_DISPLAY (display))
    {
      // make Wayland-specific calls here
    }
@@ -29,7 +29,7 @@ calls to different backends, and error out on unsupported windowing systems:
  else
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (display))
+  if (GTK_IS_WAYLAND_DISPLAY (display))
    {
      // make Wayland-specific calls here
    }
@@ -3,21 +3,29 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
 repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
-docs_url = "https://docs.gtk.org/gsk4/"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 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 +37,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 = [
@@ -13,10 +13,12 @@ if get_option('gtk_doc')
    command: [
      gidocgen,
      'generate',
-      gidocgen_common_args,
+      '--quiet',
+      '--fatal-warnings',
      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
      '--config=@INPUT0@',
      '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
      '--content-dir=@0@'.format(meson.current_source_dir()),
      '@INPUT1@',
    ],
@@ -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:
@@ -3,15 +3,28 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
 repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
-docs_url = "https://docs.gtk.org/gtk4/"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 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 +36,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.

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

 The root window is an X11-centric concept that is no longer exposed in the
 backend-neutral GDK API. If you need to interact with the X11 root window,
-you can use [`method@GdkX11.Display.get_xrootwindow`] to get its XID.
+you can use [method@GdkX11.Display.get_xrootwindow] to get its XID.

 ### Stop using `GdkVisual`

@@ -333,9 +333,9 @@ had replacements in GTK 3 and were deprecated in favor of `GdkSeat`.

 In GTK 4, the two roles of a standalone toplevel window and of a popup that
 is placed relative to a parent window have been separated out into two
-interfaces, [iface@Gdk.Toplevel] and [iface@Gdk.Popup]. Surfaces
-implementing these interfaces are created with [`ctor@Gdk.Surface.new_toplevel`]
-and [`ctor@Gdk.Surface.new_popup`], respectively, and they are presented on
+interfaces, [class@Gdk.Toplevel] and [class@Gdk.Popup]. Surfaces
+implementing these interfaces are created with [ctor@Gdk.Surface.new_toplevel]
+and [ctor@Gdk.Surface.new_popup], respectively, and they are presented on
 screen using [method@Gdk.Toplevel.present] and [method@Gdk.Popup.present].
 The `present()` functions take parameters in the form of an auxiliary layout
 struct, [struct@Gdk.PopupLayout] or [struct@Gdk.ToplevelLayout].
@@ -362,9 +362,9 @@ windows, you you will have to use Xlib apis.

 A number of minor API cleanups have happened in `GdkSurface`
 as well. For example, `gdk_surface_input_shape_combine_region()`
-has been renamed to [`method@Gdk.Surface.set_input_region`], and
+has been renamed to [method@Gdk.Surface.set_input_region], and
 `gdk_surface_begin_resize_drag()` has been renamed to
-[`method@Gdk.Toplevel.begin_resize`].
+[method@Gdk.Toplevel.begin_resize].

 ### The "iconified" window state has been renamed to "minimized"

@@ -388,7 +388,7 @@ have accessors that you will have to use.

 Event compression is always enabled in GTK 4, for both motion and
 scroll events. If you need to see the uncoalesced motion or scroll
-history, use [`method@Gdk.Event.get_history`] on the latest event.
+history, use [method@Gdk.Event.get_history] on the latest event.

 ### Stop using grabs

@@ -410,8 +410,8 @@ have been removed. Update your code accordingly.
 Any APIs that deal with global (or root) coordinates have been
 removed in GTK 4, since not all backends support them. You should
 replace your use of such APIs with surface-relative equivalents.
-Examples of such removed APIs are `gdk_window_get_origin()`,
-`gdk_window_move()` or `gdk_event_get_root_coords()`.
+Examples of this are `gdk_surface_get_origin()`, `gdk_surface_move()`
+or `gdk_event_get_root_coords()`.

 ### Adapt to `GdkKeymap` API changes

@@ -1054,7 +1054,7 @@ Observing widget contents and widget size is now done by using the

 ### Monitor handling has changed

-Instead of a monitor number, [class@Gdk.Monitor] is now used throughout.
+Instead of a monitor number, [class@Gdk.Monitor] is now used throughout. 
 [method@Gdk.Display.get_monitors] returns the list of monitors that can be queried
 or observed for monitors to pass to APIs like [method@Gtk.Window.fullscreen_on_monitor].

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

@@ -14,7 +14,7 @@ the question you have, this list is a good place to start.
    (most of it about GTK 2.x and 3.x, but still somewhat applicable). This
    reference manual also contains a introductory
    [Getting Started](#gtk-getting-started) part.
-
+    
    More documentation ranging from whitepapers to online books can be found at
    the [GNOME developer's site](https://developer.gnome.org). After studying these
    materials you should be well prepared to come back to this reference manual for details.
@@ -93,11 +93,11 @@ the question you have, this list is a good place to start.

    `gi18n.h` provides the following shorthand macros for convenience.
    Conventionally, people define macros as follows for convenience:
-
+    
        #define  _(x)     gettext (x)
        #define N_(x)     x
        #define C_(ctx,x) pgettext (ctx, x)
-
+        
    You use `N_()` (N stands for no-op) to mark a string for translation in
    a location where a function call to gettext() is not allowed, such as
    in an array initializer. You eventually have to call gettext() on the
@@ -205,14 +205,14 @@ the question you have, this list is a good place to start.
    Here is an example showing the three approaches using the copyright
    sign © which has Unicode and ISO-8859-1 codepoint 169 and is represented
    in UTF-8 by the two bytes 194, 169, or `"\302\251"` as a string literal:
-
+    
        g_print ("direct UTF-8: ©");
        g_print ("escaped UTF-8: \302\251");
        text = g_convert ("runtime conversion: ©", -1,
                          "ISO-8859-1", "UTF-8", NULL, NULL, NULL);
        g_print (text);
        g_free (text);
-
+        
    If you are using gettext() to localize your application, you need
    to call bind_textdomain_codeset() to ensure that translated strings
    are returned in UTF-8 encoding.
@@ -432,10 +432,10 @@ the question you have, this list is a good place to start.

 26. How do I associate some data with a row in the tree?

-    Remember that the [iface@Gtk.TreeModel] columns don't necessarily have to be
+    Remember that the [class@Gtk.TreeModel] columns don't necessarily have to be
    displayed. So you can put non-user-visible data in your model just
    like any other data, and retrieve it with [method@Gtk.TreeModel.get].
-    See the [tree widget overview](#TreeWidget).
+    See the [tree widget overview](#TreeWidget).        

 27. How do I put an image and some text in the same column?

@@ -447,7 +447,7 @@ the question you have, this list is a good place to start.
 28. I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
    [method@Gtk.ListStore.set] and [method@Gtk.TreeStore.set], but can't read it back?

-    Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [iface@Gtk.TreeModel]
+    Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [class@Gtk.TreeModel]
    interface. As a consequence, you can use any function this interface
    implements. The easiest way to read a set of data back is to use
    [method@Gtk.TreeModel.get].
@@ -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
@@ -133,7 +133,7 @@ gtk_text_buffer_set_text (buffer, "Hello, this is some text", -1);
 provider = gtk_css_provider_new ();
 gtk_css_provider_load_from_data (provider,
                                 "textview {"
-                                 " font: 15px serif;"
+                                 " font: 15 serif;"
                                 "  color: green;"
                                 "}",
                                 -1);
@@ -149,9 +149,9 @@ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 30);
 tag = gtk_text_buffer_create_tag (buffer, "blue_foreground",
                                  "foreground", "blue",
                                  NULL);
-gtk_text_buffer_get_iter_at_offset (buffer, &start, 7);
-gtk_text_buffer_get_iter_at_offset (buffer, &end, 12);
-gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
+gtk_text_buffer_get_iter_at_offset (buffer, &amp;start, 7);
+gtk_text_buffer_get_iter_at_offset (buffer, &amp;end, 12);
+gtk_text_buffer_apply_tag (buffer, tag, &amp;start, &amp;end);
 ```

 The `gtk4-demo` application that comes with
@@ -3,15 +3,6 @@ toml_conf.set('version', meson.project_version())

 gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))

-gidocgen_common_args = [
-  '--quiet',
-  '--no-namespace-dir',
-]
-
-if get_option('werror')
-  gidocgen_common_args += ['--fatal-warnings']
-endif
-
 docs_dir = gtk_datadir / 'doc'

 if get_option('gtk_doc') and not build_gir
@@ -620,28 +620,21 @@ gdk_broadway_server_upload_texture (GdkBroadwayServer *server,
  gsize size;
  int fd;

+  id = server->next_texture_id++;
+
  bytes = gdk_texture_save_to_png_bytes (texture);
  fd = open_shared_memory ();
  data = g_bytes_get_data (bytes, &size);

-  id = server->next_texture_id++;
-
-  msg.id = id;
-  msg.offset = 0;
-  msg.size = 0;
-
-  while (msg.size < size)
+  while (size)
    {
-      gssize ret = write (fd, data + msg.size, size - msg.size);
+      gssize ret = write (fd, data, size);

      if (ret <= 0)
-        {
-          if (errno == EINTR)
-            continue;
-          break;
-        }
+        break;

-      msg.size += ret;
+      size -= ret;
+      data += ret;
    }

  g_bytes_unref (bytes);
@@ -47,7 +47,6 @@
 #include <gdk/gdkdragsurface.h>
 #include <gdk/gdkdrawcontext.h>
 #include <gdk/gdkdrop.h>
-#include <gdk/gdkenums.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkframeclock.h>
@@ -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
@@ -1253,14 +1253,14 @@ gdk_clipboard_set_content (GdkClipboard       *clipboard,
 * @...: value contents conforming to @type
 *
 * Sets the clipboard to contain the value collected from the given varargs.
- *
+ * 
 * Values should be passed the same way they are passed to other value
 * collecting APIs, such as [`method@GObject.Object.set`] or
- * [`func@GObject.signal_emit`].
+ * [`id@g_signal_emit`].
 *
 * ```c
 * gdk_clipboard_set (clipboard, GTK_TYPE_STRING, "Hello World");
- *
+ * 
 * gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, some_texture);
 * ```
 */
@@ -49,7 +49,7 @@

 typedef struct _Deserializer Deserializer;

-struct _Deserializer
+struct _Deserializer 
 {
  const char *                    mime_type; /* interned */
  GType                           type;
@@ -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.
@@ -934,6 +934,25 @@ init (void)

  formats = gdk_pixbuf_get_formats ();

+  /* Make sure png comes first */
+  for (f = formats; f; f = f->next)
+    {
+      GdkPixbufFormat *fmt = f->data;
+      char *name;
+
+      name = gdk_pixbuf_format_get_name (fmt);
+      if (g_str_equal (name, "png"))
+        {
+          formats = g_slist_delete_link (formats, f);
+          formats = g_slist_prepend (formats, fmt);
+
+          g_free (name);
+          break;
+        }
+
+      g_free (name);
+    }
+
  for (f = formats; f; f = f->next)
    {
      GdkPixbufFormat *fmt = f->data;
@@ -718,33 +718,19 @@ gdk_content_formats_builder_to_formats (GdkContentFormatsBuilder *builder)

  g_return_val_if_fail (builder != NULL, NULL);

-  if (builder->n_gtypes > 0)
-    {
-      gtypes = g_new (GType, builder->n_gtypes + 1);
-      i = builder->n_gtypes;
-      gtypes[i--] = G_TYPE_INVALID;
-      /* add backwards because most important type is last in the list */
-      for (l = builder->gtypes; l; l = l->next)
-        gtypes[i--] = GPOINTER_TO_SIZE (l->data);
-    }
-  else
-    {
-      gtypes = NULL;
-    }
+  gtypes = g_new (GType, builder->n_gtypes + 1);
+  i = builder->n_gtypes;
+  gtypes[i--] = G_TYPE_INVALID;
+  /* add backwards because most important type is last in the list */
+  for (l = builder->gtypes; l; l = l->next)
+    gtypes[i--] = GPOINTER_TO_SIZE (l->data);

-  if (builder->n_mime_types > 0)
-    {
-      mime_types = g_new (const char *, builder->n_mime_types + 1);
-      i = builder->n_mime_types;
-      mime_types[i--] = NULL;
-      /* add backwards because most important type is last in the list */
-      for (l = builder->mime_types; l; l = l->next)
-        mime_types[i--] = l->data;
-    }
-  else
-    {
-      mime_types = NULL;
-    }
+  mime_types = g_new (const char *, builder->n_mime_types + 1);
+  i = builder->n_mime_types;
+  mime_types[i--] = NULL;
+  /* add backwards because most important type is last in the list */
+  for (l = builder->mime_types; l; l = l->next)
+    mime_types[i--] = l->data;

  result = gdk_content_formats_new_take (gtypes, builder->n_gtypes,
                                         mime_types, builder->n_mime_types);
@@ -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.
@@ -54,7 +54,7 @@

 typedef struct _Serializer Serializer;

-struct _Serializer
+struct _Serializer 
 {
  const char *                    mime_type; /* interned */
  GType                           type;
@@ -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)
@@ -446,7 +446,7 @@ lookup_serializer (const char *mime_type,
          serializer->type == type)
        return serializer;
    }
-
+  
  return NULL;
 }

@@ -630,7 +630,7 @@ pixbuf_serializer (GdkContentSerializer *serializer)
  const GValue *value;
  GdkPixbuf *pixbuf;
  const char *name;
-
+  
  name = gdk_content_serializer_get_user_data (serializer);
  value = gdk_content_serializer_get_value (serializer);

@@ -651,7 +651,7 @@ pixbuf_serializer (GdkContentSerializer *serializer)
  gdk_pixbuf_save_to_stream_async (pixbuf,
                                   gdk_content_serializer_get_output_stream (serializer),
                                   name,
-                                   gdk_content_serializer_get_cancellable (serializer),
+				   gdk_content_serializer_get_cancellable (serializer),
                                   pixbuf_serializer_finish,
                                   serializer,
                                   g_str_equal (name, "png") ? "compression" : NULL, "2",
@@ -823,7 +823,7 @@ file_uri_serializer (GdkContentSerializer *serializer)
  else if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
    {
      GSList *l;
-
+      
      for (l = g_value_get_boxed (value); l; l = l->next)
        {
          uri = g_file_get_uri (l->data);
@@ -867,7 +867,7 @@ file_text_serializer (GdkContentSerializer *serializer)
    {
      GString *str;
      GSList *l;
-
+      
      str = g_string_new (NULL);

      for (l = g_value_get_boxed (value); l; l = l->next)
@@ -966,6 +966,25 @@ init (void)

  formats = gdk_pixbuf_get_formats ();

+  /* Make sure png comes first */
+  for (f = formats; f; f = f->next)
+    {
+      GdkPixbufFormat *fmt = f->data;
+      char *name;
+
+      name = gdk_pixbuf_format_get_name (fmt);
+      if (g_str_equal (name, "png"))
+        {
+          formats = g_slist_delete_link (formats, f);
+          formats = g_slist_prepend (formats, fmt);
+
+          g_free (name);
+          break;
+        }
+
+      g_free (name);
+    }
+
  for (f = formats; f; f = f->next)
    {
      GdkPixbufFormat *fmt = f->data;
@@ -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
@@ -1238,7 +1238,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)
@@ -25,7 +25,6 @@
 #include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdevicetool.h>
-#include <gdk/gdkenums.h>


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

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


 G_BEGIN_DECLS
@@ -1340,7 +1340,7 @@ gdk_display_prepare_gl (GdkDisplay  *self,
 * Before using the returned `GdkGLContext`, you will need to
 * call [method@Gdk.GLContext.make_current] or [method@Gdk.GLContext.realize].
 *
- * Returns: (transfer full): the newly created `GdkGLContext`
+ * Returns: (transfer full) (nullable): the newly created `GdkGLContext`
 *
 * Since: 4.6
 */
@@ -1438,6 +1438,31 @@ describe_egl_config (EGLDisplay egl_display,
 }
 #endif

+/*<private>
+ * gdk_display_get_egl_display:
+ * @self: a display
+ *
+ * Retrieves the EGL display connection object for the given GDK display.
+ *
+ * This function returns `NULL` if GL is not supported or GDK is using
+ * a different OpenGL framework than EGL.
+ *
+ * Returns: (nullable): the EGL display object
+ */
+gpointer
+gdk_display_get_egl_display (GdkDisplay *self)
+{
+  GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
+
+  if (!priv->egl_display &&
+      !gdk_display_prepare_gl (self, NULL))
+    return NULL;
+
+  return priv->egl_display;
+}
+
 gpointer
 gdk_display_get_egl_config (GdkDisplay *self)
 {
@@ -1721,12 +1746,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,
@@ -1764,35 +1789,6 @@ gdk_display_init_egl (GdkDisplay  *self,
 }
 #endif

-/*<private>
- * gdk_display_get_egl_display:
- * @self: a display
- *
- * Retrieves the EGL display connection object for the given GDK display.
- *
- * This function returns `NULL` if GL is not supported or GDK is using
- * a different OpenGL framework than EGL.
- *
- * Returns: (nullable): the EGL display object
- */
-gpointer
-gdk_display_get_egl_display (GdkDisplay *self)
-{
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
-
-  g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
-
-#ifdef HAVE_EGL
-  if (!priv->egl_display &&
-      !gdk_display_prepare_gl (self, NULL))
-    return NULL;
-
-  return priv->egl_display;
-#else
-  return NULL;
-#endif
-}
-
 GdkDebugFlags
 gdk_display_get_debug_flags (GdkDisplay *display)
 {
@@ -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
@@ -29,10 +29,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

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

 G_BEGIN_DECLS

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

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

@@ -1,336 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * 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/>.
- */
-
-/*
- * 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/.
- */
-
-#ifndef __GDK_ENUMS_H__
-#define __GDK_ENUMS_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* Currently, these are the same values numerically as in the
- * X protocol. If you change that, gdksurface-x11.c/gdk_surface_set_geometry_hints()
- * will need fixing.
- */
-/**
- * GdkGravity:
- * @GDK_GRAVITY_NORTH_WEST: the reference point is at the top left corner.
- * @GDK_GRAVITY_NORTH: the reference point is in the middle of the top edge.
- * @GDK_GRAVITY_NORTH_EAST: the reference point is at the top right corner.
- * @GDK_GRAVITY_WEST: the reference point is at the middle of the left edge.
- * @GDK_GRAVITY_CENTER: the reference point is at the center of the surface.
- * @GDK_GRAVITY_EAST: the reference point is at the middle of the right edge.
- * @GDK_GRAVITY_SOUTH_WEST: the reference point is at the lower left corner.
- * @GDK_GRAVITY_SOUTH: the reference point is at the middle of the lower edge.
- * @GDK_GRAVITY_SOUTH_EAST: the reference point is at the lower right corner.
- * @GDK_GRAVITY_STATIC: the reference point is at the top left corner of the
- *  surface itself, ignoring window manager decorations.
- *
- * Defines the reference point of a surface and is used in `GdkPopupLayout`.
- */
-typedef enum
-{
-  GDK_GRAVITY_NORTH_WEST = 1,
-  GDK_GRAVITY_NORTH,
-  GDK_GRAVITY_NORTH_EAST,
-  GDK_GRAVITY_WEST,
-  GDK_GRAVITY_CENTER,
-  GDK_GRAVITY_EAST,
-  GDK_GRAVITY_SOUTH_WEST,
-  GDK_GRAVITY_SOUTH,
-  GDK_GRAVITY_SOUTH_EAST,
-  GDK_GRAVITY_STATIC
-} GdkGravity;
-
-/* Types of modifiers.
- */
-/**
- * GdkModifierType:
- * @GDK_SHIFT_MASK: the Shift key.
- * @GDK_LOCK_MASK: a Lock key (depending on the modifier mapping of the
- *  X server this may either be CapsLock or ShiftLock).
- * @GDK_CONTROL_MASK: the Control key.
- * @GDK_ALT_MASK: the fourth modifier key (it depends on the modifier
- *  mapping of the X server which key is interpreted as this modifier, but
- *  normally it is the Alt key).
- * @GDK_BUTTON1_MASK: the first mouse button.
- * @GDK_BUTTON2_MASK: the second mouse button.
- * @GDK_BUTTON3_MASK: the third mouse button.
- * @GDK_BUTTON4_MASK: the fourth mouse button.
- * @GDK_BUTTON5_MASK: the fifth mouse button.
- * @GDK_SUPER_MASK: the Super modifier
- * @GDK_HYPER_MASK: the Hyper modifier
- * @GDK_META_MASK: the Meta modifier
- *
- * Flags to indicate the state of modifier keys and mouse buttons
- * in events.
- *
- * Typical modifier keys are Shift, Control, Meta, Super, Hyper, Alt, Compose,
- * Apple, CapsLock or ShiftLock.
- *
- * Note that GDK may add internal values to events which include values outside
- * of this enumeration. Your code should preserve and ignore them.  You can use
- * %GDK_MODIFIER_MASK to remove all private values.
- */
-typedef enum
-{
-  GDK_SHIFT_MASK    = 1 << 0,
-  GDK_LOCK_MASK     = 1 << 1,
-  GDK_CONTROL_MASK  = 1 << 2,
-  GDK_ALT_MASK      = 1 << 3,
-
-  GDK_BUTTON1_MASK  = 1 << 8,
-  GDK_BUTTON2_MASK  = 1 << 9,
-  GDK_BUTTON3_MASK  = 1 << 10,
-  GDK_BUTTON4_MASK  = 1 << 11,
-  GDK_BUTTON5_MASK  = 1 << 12,
-
-  GDK_SUPER_MASK    = 1 << 26,
-  GDK_HYPER_MASK    = 1 << 27,
-  GDK_META_MASK     = 1 << 28,
-} GdkModifierType;
-
-
-/**
- * GDK_MODIFIER_MASK:
- *
- * A mask covering all entries in `GdkModifierType`.
- */
-#define GDK_MODIFIER_MASK (GDK_SHIFT_MASK|GDK_LOCK_MASK|GDK_CONTROL_MASK| \
-                           GDK_ALT_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK| \
-                           GDK_BUTTON1_MASK|GDK_BUTTON2_MASK|GDK_BUTTON3_MASK| \
-                           GDK_BUTTON4_MASK|GDK_BUTTON5_MASK)
-
-
-/**
- * GdkGLError:
- * @GDK_GL_ERROR_NOT_AVAILABLE: OpenGL support is not available
- * @GDK_GL_ERROR_UNSUPPORTED_FORMAT: The requested visual format is not supported
- * @GDK_GL_ERROR_UNSUPPORTED_PROFILE: The requested profile is not supported
- * @GDK_GL_ERROR_COMPILATION_FAILED: The shader compilation failed
- * @GDK_GL_ERROR_LINK_FAILED: The shader linking failed
- *
- * Error enumeration for `GdkGLContext`.
- */
-typedef enum {
-  GDK_GL_ERROR_NOT_AVAILABLE,
-  GDK_GL_ERROR_UNSUPPORTED_FORMAT,
-  GDK_GL_ERROR_UNSUPPORTED_PROFILE,
-  GDK_GL_ERROR_COMPILATION_FAILED,
-  GDK_GL_ERROR_LINK_FAILED
-} GdkGLError;
-
-/**
- * GdkVulkanError:
- * @GDK_VULKAN_ERROR_UNSUPPORTED: Vulkan is not supported on this backend or has not been
- *   compiled in.
- * @GDK_VULKAN_ERROR_NOT_AVAILABLE: Vulkan support is not available on this Surface
- *
- * Error enumeration for `GdkVulkanContext`.
- */
-typedef enum {
-  GDK_VULKAN_ERROR_UNSUPPORTED,
-  GDK_VULKAN_ERROR_NOT_AVAILABLE,
-} GdkVulkanError;
-
-/**
- * GdkAxisUse:
- * @GDK_AXIS_IGNORE: the axis is ignored.
- * @GDK_AXIS_X: the axis is used as the x axis.
- * @GDK_AXIS_Y: the axis is used as the y axis.
- * @GDK_AXIS_DELTA_X: the axis is used as the scroll x delta
- * @GDK_AXIS_DELTA_Y: the axis is used as the scroll y delta
- * @GDK_AXIS_PRESSURE: the axis is used for pressure information.
- * @GDK_AXIS_XTILT: the axis is used for x tilt information.
- * @GDK_AXIS_YTILT: the axis is used for y tilt information.
- * @GDK_AXIS_WHEEL: the axis is used for wheel information.
- * @GDK_AXIS_DISTANCE: the axis is used for pen/tablet distance information
- * @GDK_AXIS_ROTATION: the axis is used for pen rotation information
- * @GDK_AXIS_SLIDER: the axis is used for pen slider information
- * @GDK_AXIS_LAST: a constant equal to the numerically highest axis value.
- *
- * Defines how device axes are interpreted by GTK.
- *
- * Note that the X and Y axes are not really needed; pointer devices
- * report their location via the x/y members of events regardless. Whether
- * X and Y are present as axes depends on the GDK backend.
- */
-typedef enum
-{
-  GDK_AXIS_IGNORE,
-  GDK_AXIS_X,
-  GDK_AXIS_Y,
-  GDK_AXIS_DELTA_X,
-  GDK_AXIS_DELTA_Y,
-  GDK_AXIS_PRESSURE,
-  GDK_AXIS_XTILT,
-  GDK_AXIS_YTILT,
-  GDK_AXIS_WHEEL,
-  GDK_AXIS_DISTANCE,
-  GDK_AXIS_ROTATION,
-  GDK_AXIS_SLIDER,
-  GDK_AXIS_LAST
-} GdkAxisUse;
-
-/**
- * GdkAxisFlags:
- * @GDK_AXIS_FLAG_X: X axis is present
- * @GDK_AXIS_FLAG_Y: Y axis is present
- * @GDK_AXIS_FLAG_DELTA_X: Scroll X delta axis is present
- * @GDK_AXIS_FLAG_DELTA_Y: Scroll Y delta axis is present
- * @GDK_AXIS_FLAG_PRESSURE: Pressure axis is present
- * @GDK_AXIS_FLAG_XTILT: X tilt axis is present
- * @GDK_AXIS_FLAG_YTILT: Y tilt axis is present
- * @GDK_AXIS_FLAG_WHEEL: Wheel axis is present
- * @GDK_AXIS_FLAG_DISTANCE: Distance axis is present
- * @GDK_AXIS_FLAG_ROTATION: Z-axis rotation is present
- * @GDK_AXIS_FLAG_SLIDER: Slider axis is present
- *
- * Flags describing the current capabilities of a device/tool.
- */
-typedef enum
-{
-  GDK_AXIS_FLAG_X        = 1 << GDK_AXIS_X,
-  GDK_AXIS_FLAG_Y        = 1 << GDK_AXIS_Y,
-  GDK_AXIS_FLAG_DELTA_X  = 1 << GDK_AXIS_DELTA_X,
-  GDK_AXIS_FLAG_DELTA_Y  = 1 << GDK_AXIS_DELTA_Y,
-  GDK_AXIS_FLAG_PRESSURE = 1 << GDK_AXIS_PRESSURE,
-  GDK_AXIS_FLAG_XTILT    = 1 << GDK_AXIS_XTILT,
-  GDK_AXIS_FLAG_YTILT    = 1 << GDK_AXIS_YTILT,
-  GDK_AXIS_FLAG_WHEEL    = 1 << GDK_AXIS_WHEEL,
-  GDK_AXIS_FLAG_DISTANCE = 1 << GDK_AXIS_DISTANCE,
-  GDK_AXIS_FLAG_ROTATION = 1 << GDK_AXIS_ROTATION,
-  GDK_AXIS_FLAG_SLIDER   = 1 << GDK_AXIS_SLIDER,
-} GdkAxisFlags;
-
-/**
- * GdkDragAction:
- * @GDK_ACTION_COPY: Copy the data.
- * @GDK_ACTION_MOVE: Move the data, i.e. first copy it, then delete
- *   it from the source using the DELETE target of the X selection protocol.
- * @GDK_ACTION_LINK: Add a link to the data. Note that this is only
- *   useful if source and destination agree on what it means, and is not
- *   supported on all platforms.
- * @GDK_ACTION_ASK: Ask the user what to do with the data.
- *
- * Used in `GdkDrop` and `GdkDrag` to indicate the actions that the
- * destination can and should do with the dropped data.
- */
-typedef enum
-{
-  GDK_ACTION_COPY    = 1 << 0,
-  GDK_ACTION_MOVE    = 1 << 1,
-  GDK_ACTION_LINK    = 1 << 2,
-  GDK_ACTION_ASK     = 1 << 3
-} GdkDragAction;
-
-/**
- * GDK_ACTION_ALL:
- *
- * Defines all possible DND actions.
- *
- * This can be used in [method@Gdk.Drop.status] messages when any drop
- * can be accepted or a more specific drop method is not yet known.
- */
-#define GDK_ACTION_ALL (GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK)
-
-/**
- * GdkMemoryFormat:
- * @GDK_MEMORY_B8G8R8A8_PREMULTIPLIED: 4 bytes; for blue, green, red, alpha.
- *   The color values are premultiplied with the alpha value.
- * @GDK_MEMORY_A8R8G8B8_PREMULTIPLIED: 4 bytes; for alpha, red, green, blue.
- *   The color values are premultiplied with the alpha value.
- * @GDK_MEMORY_R8G8B8A8_PREMULTIPLIED: 4 bytes; for red, green, blue, alpha
- *   The color values are premultiplied with the alpha value.
- * @GDK_MEMORY_B8G8R8A8: 4 bytes; for blue, green, red, alpha.
- * @GDK_MEMORY_A8R8G8B8: 4 bytes; for alpha, red, green, blue.
- * @GDK_MEMORY_R8G8B8A8: 4 bytes; for red, green, blue, alpha.
- * @GDK_MEMORY_A8B8G8R8: 4 bytes; for alpha, blue, green, red.
- * @GDK_MEMORY_R8G8B8: 3 bytes; for red, green, blue. The data is opaque.
- * @GDK_MEMORY_B8G8R8: 3 bytes; for blue, green, red. The data is opaque.
- * @GDK_MEMORY_R16G16B16: 3 guint16 values; for red, green, blue. Since: 4.6
- * @GDK_MEMORY_R16G16B16A16_PREMULTIPLIED: 4 guint16 values; for red, green,
- *   blue, alpha. The color values are premultiplied with the alpha value.
- *  Since: 4.6
- * @GDK_MEMORY_R16G16B16A16: 4 guint16 values; for red, green, blue, alpha.
- *  Since: 4.6
- * @GDK_MEMORY_R16G16B16_FLOAT: 3 half-float values; for red, green, blue.
- *   The data is opaque. Since: 4.6
- * @GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED: 4 half-float values; for
- *   red, green, blue and alpha. The color values are premultiplied with
- *   the alpha value. Since: 4.6
- * @GDK_MEMORY_R16G16B16A16_FLOAT: 4 half-float values; for red, green,
- *   blue and alpha. Since: 4.6
- * @GDK_MEMORY_B32G32R32_FLOAT: 3 float values; for blue, green, red.
- *   The data is opaque. Since: 4.6
- * @GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED: 4 float values; for
- *   red, green, blue and alpha. The color values are premultiplied with
- *   the alpha value. Since: 4.6
- * @GDK_MEMORY_R32G32B32A32_FLOAT: 4 float values; for red, green, blue and
- *   alpha. Since: 4.6
- * @GDK_MEMORY_N_FORMATS: The number of formats. This value will change as
- *   more formats get added, so do not rely on its concrete integer.
- *
- * `GdkMemoryFormat` describes formats that image data can have in memory.
- *
- * It describes formats by listing the contents of the memory passed to it.
- * So GDK_MEMORY_A8R8G8B8 will be 1 byte (8 bits) of alpha, followed by a
- * byte each of red, green and blue. It is not endian-dependent, so
- * CAIRO_FORMAT_ARGB32 is represented by different `GdkMemoryFormats`
- * on architectures with different endiannesses.
- *
- * Its naming is modelled after
- * [VkFormat](https://www.khronos.org/registry/vulkan/specs/1.0/html/vkspec.html#VkFormat)
- * for details).
- */
-typedef enum {
-  GDK_MEMORY_B8G8R8A8_PREMULTIPLIED,
-  GDK_MEMORY_A8R8G8B8_PREMULTIPLIED,
-  GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
-  GDK_MEMORY_B8G8R8A8,
-  GDK_MEMORY_A8R8G8B8,
-  GDK_MEMORY_R8G8B8A8,
-  GDK_MEMORY_A8B8G8R8,
-  GDK_MEMORY_R8G8B8,
-  GDK_MEMORY_B8G8R8,
-  GDK_MEMORY_R16G16B16,
-  GDK_MEMORY_R16G16B16A16_PREMULTIPLIED,
-  GDK_MEMORY_R16G16B16A16,
-  GDK_MEMORY_R16G16B16_FLOAT,
-  GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED,
-  GDK_MEMORY_R16G16B16A16_FLOAT,
-  GDK_MEMORY_R32G32B32_FLOAT,
-  GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED,
-  GDK_MEMORY_R32G32B32A32_FLOAT,
-
-  GDK_MEMORY_N_FORMATS
-} GdkMemoryFormat;
-
-G_END_DECLS
-
-#endif /* __GDK_ENUMS_H__ */
@@ -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;
@@ -598,9 +596,6 @@ _gdk_event_unqueue (GdkDisplay *display)
 /*
 * If the last N events in the event queue are smooth scroll events
 * for the same surface and device, combine them into one.
- *
- * We give the remaining event a history with N items, and deltas
- * that are the sum over the history entries.
 */
 void
 gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
@@ -610,6 +605,7 @@ 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;
  GdkTimeCoord hist;

@@ -644,42 +640,35 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
      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;
@@ -687,29 +676,13 @@ 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,
+                                    delta_x + dx,
+                                    delta_y + dy,
                                    gdk_scroll_event_is_stop (old_event));

      ((GdkScrollEvent *)event)->history = history;
@@ -719,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
@@ -733,41 +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);
-  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]);
-    }
-  else
-    {
-      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]);
-    }
+  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]);
+
+  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)
 {
@@ -777,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)
@@ -813,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
@@ -927,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
@@ -1156,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
@@ -1209,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)
@@ -2461,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,
@@ -2488,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,
 };
@@ -2496,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;
@@ -2534,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;
@@ -2571,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
@@ -2607,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;
 }
@@ -2628,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;
 }
@@ -2987,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
@@ -29,12 +29,11 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

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

 G_BEGIN_DECLS

@@ -169,8 +168,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 +202,6 @@ typedef enum
  GDK_PAD_RING,
  GDK_PAD_STRIP,
  GDK_PAD_GROUP_MODE,
-  GDK_TOUCHPAD_HOLD,
  GDK_EVENT_LAST        /* helper variable for decls */
 } GdkEventType;

@@ -105,7 +105,7 @@ struct _GdkDeleteEvent
 * GdkMotionEvent:
 * @state: (type GdkModifierType): a bit-mask representing the state of
 *   the modifier keys (e.g. Control, Shift and Alt) set during the motion
- *   event. See [flags@Gdk.ModifierType]
+ *   event. See [enum@Gdk.ModifierType]
 * @x: the x coordinate of the pointer relative to the surface.
 * @y: the y coordinate of the pointer relative to the surface.
 * @axes: @x, @y translated to the axes of @device, or %NULL if @device is
@@ -132,7 +132,7 @@ struct _GdkMotionEvent
 * GdkButtonEvent:
 * @state: (type GdkModifierType): a bit-mask representing the state of
 *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
 * @button: the button which was pressed or released, numbered from 1 to 5.
 *   Normally button 1 is the left mouse button, 2 is the middle button,
 *   and 3 is the right button. On 2-button mice, the middle button can
@@ -162,7 +162,7 @@ struct _GdkButtonEvent
 * GdkTouchEvent:
 * @state: (type GdkModifierType): a bit-mask representing the state of
 *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
 * @x: the x coordinate of the pointer relative to the surface
 * @y: the y coordinate of the pointer relative to the surface
 * @axes: @x, @y translated to the axes of the event's device, or %NULL
@@ -200,7 +200,7 @@ struct _GdkTouchEvent
 * @y: the y coordinate of the pointer relative to the surface.
 * @state: (type GdkModifierType): a bit-mask representing the state of
 *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
 * @direction: the direction to scroll to (one of %GDK_SCROLL_UP,
 *   %GDK_SCROLL_DOWN, %GDK_SCROLL_LEFT, %GDK_SCROLL_RIGHT or
 *   %GDK_SCROLL_SMOOTH).
@@ -209,7 +209,7 @@ 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
 *
@@ -233,7 +233,7 @@ struct _GdkScrollEvent
  gboolean pointer_emulated;
  gboolean is_stop;
  GdkDeviceTool *tool;
-  GArray *history; /* <GdkTimeCoord> */
+  GArray *history; /* <GdkScrollHistory> */
 };

 /*
@@ -256,7 +256,7 @@ typedef struct {
 * GdkKeyEvent:
 * @state: (type GdkModifierType): a bit-mask representing the state of
 *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
 * @keycode: the raw code of the key that was pressed or released.
 * @translated: the result of translating @keycode. First with the full
 *   @state, then while ignoring Caps Lock.
@@ -277,7 +277,7 @@ struct _GdkKeyEvent
 * GdkCrossingEvent:
 * @state: (type GdkModifierType): a bit-mask representing the state of
 *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
 * @mode: the crossing mode (%GDK_CROSSING_NORMAL, %GDK_CROSSING_GRAB,
 *  %GDK_CROSSING_UNGRAB, %GDK_CROSSING_GTK_GRAB, %GDK_CROSSING_GTK_UNGRAB or
 *  %GDK_CROSSING_STATE_CHANGED).  %GDK_CROSSING_GTK_GRAB, %GDK_CROSSING_GTK_UNGRAB,
@@ -383,7 +383,7 @@ struct _GdkDNDEvent
 * GdkTouchpadEvent:
 * @state: (type GdkModifierType): a bit-mask representing the state of
 *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
- *   buttons. See [flags@Gdk.ModifierType]
+ *   buttons. See [enum@Gdk.ModifierType]
 * @phase: (type GdkTouchpadGesturePhase): the current phase of the gesture
 * @n_fingers: The number of fingers triggering the pinch
 * @time: the time of the event in milliseconds
@@ -402,7 +402,6 @@ struct _GdkTouchpadEvent
 {
  GdkEvent parent_instance;

-  GdkEventSequence *sequence;
  GdkModifierType state;
  gint8 phase;
  gint8 n_fingers;
@@ -507,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,
@@ -533,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)
@@ -261,7 +255,7 @@ static GdkGLAPI
 gdk_gl_context_real_realize (GdkGLContext  *context,
                             GError       **error)
 {
-#ifdef HAVE_EGL
+#if HAVE_EGL
  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
  GdkDisplay *display = gdk_gl_context_get_display (context);
  EGLDisplay egl_display = gdk_display_get_egl_display (display);
@@ -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;
@@ -587,11 +572,6 @@ gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
  glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);

  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 });
-#endif
 }

 static void
@@ -614,7 +594,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 +618,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 +634,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 +645,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 +992,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 +1021,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 +1318,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 +1379,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 +1650,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;
    }
@@ -392,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,
@@ -20,8 +20,6 @@

 #include "gdkkeys.h"

-#include "gdkenums.h"
-
 G_BEGIN_DECLS

 #define GDK_TYPE_KEYMAP              (gdk_keymap_get_type ())
@@ -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 */
@@ -2,4 +2,3 @@ BOOLEAN:BOXED
 BOOLEAN:OBJECT
 BOOLEAN:POINTER
 VOID:POINTER,POINTER,BOOLEAN,BOOLEAN
-VOID:INT,INT
@@ -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++)
@@ -20,7 +20,7 @@
 #ifndef __GDK_MEMORY_CONVERT_PRIVATE_H__
 #define __GDK_MEMORY_CONVERT_PRIVATE_H__

-#include "gdkenums.h"
+#include "gdktypes.h"

 G_BEGIN_DECLS

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

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

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

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

 G_BEGIN_DECLS

@@ -165,7 +165,7 @@ parse_rgb_value (const char   *str,
 *
 * The string can be either one of:
 *
- * - A standard name (Taken from the Css specification).
+ * - A standard name (Taken from the X11 rgb.txt file).
 * - A hexadecimal value in the form “\#rgb”, “\#rrggbb”,
 *   “\#rrrgggbbb” or ”\#rrrrggggbbbb”
 * - A hexadecimal value in the form “\#rgba”, “\#rrggbbaa”,
@@ -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,
@@ -43,8 +43,7 @@ struct _GdkSeatDefaultPrivate
                         GDK_ENTER_NOTIFY_MASK |                        \
                         GDK_LEAVE_NOTIFY_MASK |                        \
                         GDK_PROXIMITY_IN_MASK |                        \
-                         GDK_PROXIMITY_OUT_MASK |                       \
-                         GDK_TOUCHPAD_GESTURE_MASK)
+                         GDK_PROXIMITY_OUT_MASK)

 G_DEFINE_TYPE_WITH_PRIVATE (GdkSeatDefault, gdk_seat_default, GDK_TYPE_SEAT)

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