Steal enough Weston test code to show a yuv surface

This isn't mean to be mergable. It is just a quick hack
to get a yuv surface onscreen. It only runs under weston
atm, since mutter does not support yuv yet.

.clang-format

@@ -4,7 +4,6 @@ AlwaysBreakAfterDefinitionReturnType: All
 BreakBeforeBinaryOperators: None
 BinPackParameters: false
 SpaceAfterCStyleCast: true
-PointerAlignment: Right
 # Our column limit is actually 80, but setting that results in clang-format
 # making a lot of dubious hanging-indent choices; disable it and assume the
 # developer will line wrap appropriately. clang-format will still check

.gitlab-ci.yml

@@ -3,7 +3,6 @@ include:
     file: 'flatpak/flatpak_ci_initiative.yml'
 
 stages:
-  - check
   - build
   - analysis
   - docs
@@ -22,12 +21,12 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false -Dwayland:werror=false"
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false"
   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:v38"
-  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:
   only:
@@ -38,7 +37,7 @@ variables:
 style-check-diff:
   extends: .only-default
   image: $FEDORA_IMAGE
-  stage: check
+  stage: .pre
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
@@ -110,29 +109,6 @@ release-build:
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
 
-fedora-mingw64:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  before_script:
-    - sudo dnf install -y
-            mingw64-filesystem
-            mingw64-gcc
-            mingw64-binutils
-            mingw64-cairo
-            mingw64-gdk-pixbuf
-            mingw64-gstreamer1-plugins-bad-free
-            mingw64-glib2
-            mingw64-libepoxy
-            mingw64-pango
-            # mingw64-graphene (rawhide)
-  script:
-    - .gitlab-ci/show-info-linux.sh
-    - meson subprojects update
-    - mkdir _build && cd _build
-    - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled
-    - ninja
-
 installed-tests:
   extends: .build-fedora-default
   stage: build
@@ -293,18 +269,6 @@ flatpak-main:icon-browser:
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak-manual:node-editor:
-  extends: .flatpak-manual
-  needs: []
-  variables:
-    APPID: org.gtk.gtk4.NodeEditor
-
-flatpak-main:node-editor:
-  extends: .flatpak-main
-  needs: []
-  variables:
-    APPID: org.gtk.gtk4.NodeEditor
-
 # Publish the demo apps to the GNOME Nightly repo
 # https://wiki.gnome.org/Apps/Nightly
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
@@ -323,11 +287,6 @@ nightly icon-browser:
     dependencies: ['flatpak-main:icon-browser']
     needs: ['flatpak-main:icon-browser']
 
-nightly node-editor:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:node-editor']
-    needs: ['flatpak-main:node-editor']
-
 static-scan:
   image: $FEDORA_IMAGE
   stage: analysis
@@ -387,7 +346,6 @@ reference:
       - _reference
 
 publish-docs:
-  image: fedora:latest
   stage: publish
   needs: ['reference']
   script:

.gitlab-ci/flatpak-build.sh

@@ -16,9 +16,10 @@ flatpak-builder \
 flatpak build ${builddir} meson \
                 --prefix=/app \
                 --libdir=/app/lib \
-                --buildtype=debugoptimized \
+                --buildtype=release \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
+                -Dprint-backends=file \
                 -Dbuild-tests=false \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \

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

@@ -2,43 +2,25 @@
 
 set -e
 
-ancestor_horizon=31  # days (one month)
-
-# Recently, git is picky about directory ownership. Tell it not to worry.
-git config --global --add safe.directory "$PWD"
-
-# We need to add a new remote for the upstream target branch, since this script
-# could be running in a personal fork of the repository which has out of date
-# branches.
-#
-# Limit the fetch to a certain date horizon to limit the amount of data we get.
-# If the branch was forked from origin/main before this horizon, it should
-# probably be rebased.
-if ! git ls-remote --exit-code upstream >/dev/null 2>&1 ; then
+# We need to add a new remote for the upstream main, 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}..."
     git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
+    git fetch upstream
+    ORIGIN="upstream"
+else
+    echo "Reusing the existing repository on ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}"
+    ORIGIN="origin"
 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/glib-2-62`).
-# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` or `${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}`
-# are only defined if we’re running in a merge request pipeline,
-# fall back to `${CI_DEFAULT_BRANCH}` or `${CI_COMMIT_BRANCH}` respectively
-# otherwise.
-
-source_branch="${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-${CI_COMMIT_BRANCH}}"
-target_branch="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}"
-git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%d)" origin "${source_branch}"
-git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%d)" upstream "${target_branch}"
-
-newest_common_ancestor_sha=$(git merge-base upstream/${target_branch} origin/${source_branch})
-if [ -z "${newest_common_ancestor_sha}" ]; then
-    echo "Couldn’t find common ancestor with upstream main branch. This typically"
-    echo "happens if you branched from main a long time ago. Please update"
-    echo "your clone, rebase, and re-push your branch."
-    exit 1
-fi
-
+# `upstream/main` 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.
+newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "${ORIGIN}/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent HEAD) | head -1)
 git diff -U0 --no-color "${newest_common_ancestor_sha}" | .gitlab-ci/clang-format-diff.py -binary "clang-format" -p1
 exit_status=$?
 
@@ -54,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.md"
+echo "   https://gitlab.gnome.org/GNOME/gtk/blob/main/docs/CODING-STYLE"
 echo "Warnings from this tool can be ignored in favour of the documented "
 echo "coding style, or in favour of matching the style of existing"
 echo "surrounding code."

.gitlab-ci/test-msys2.sh

@@ -38,6 +38,25 @@ mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
+
+if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
+    git clone https://gitlab.gnome.org/GNOME/glib.git _glib
+    meson setup _glib_build _glib
+    meson compile -C _glib_build
+    meson install -C _glib_build
+fi
+pkg-config --modversion glib-2.0
+
+if ! pkg-config --atleast-version=1.50.0 pango; then
+    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
+    meson setup _pango_build _pango
+    meson compile -C _pango_build
+    meson install -C _pango_build
+fi
+pkg-config --modversion pango
+
 # Build
 ccache --zero-stats
 ccache --show-stats

NEWS

@@ -1,268 +1,3 @@
-Overview of Changes in 4.9.1, dd-mm-yyyy
-========================================
-
-
-Overview of Changes in 4.8.1, 16-09-2022
-========================================
-
-* Input:
- - Fix problems with input method interactions that caused
-   dead keys not to work
- - Accept single-key compose sequences (these are used with
-   some keyboard layouts)
-
-* GtkColumnView:
- - Flip column order in right-to-left context
-
-* GtkGridView:
- - Fix problems with rubberbanding
-
-* GtkFileChooser:
- - Fix positioning of popovers in the places view
- - Make ~ and . keyboard shortcuts work again
-
-* gsk:
- - Make glyph upload more similar to icons
-
-* Make file transfer via portals work, this fixes file
-  copy/paste and dnd in flatpaks
-
-* Translation updates:
- Catalan
- Chinese (China)
- Chinese (Taiwan)
- Latvian
-
-
-Overview of Changes in 4.8.0, 06-09-2022
-========================================
-
-* GtkTreeView:
- - Fix a problem with scrolling animations
- - Fix some event handling problems
- - Drop unreachable code
-
-* GtkText:
- - Respect the no-emoji input hint fully
-
-* GtkEmojiChooser:
- - Fix arrow key navigation
-
-* GtkFontChooser:
- - Improve the handling of OpenType font features
-
-* GtkTreeListModel:
- - Fix handling of collapsed child nodes
-
-* GtkInscription:
- - Fix accessible name
-
-* Theme:
- - Fix placeholder text in HighContrast
-
-* Increase the memory limit for the jpeg loader to 300M
-
-* Miscellaneous memory leak fixes
-
-* Wayland:
- - Refator handling of text protocol client updates
-
-* Windows:
- - Support high-resolution scroll wheel events
- - Generate GdkWin32.gir
- - Implement color picking
-
-* Translation updates
- Abkhazian
- Basque
- Brazilian Portuguese
- Bulgarian
- Catalan
- Chinese (China)
- Croatian
- Czech
- Danish
- Dutch
- Galician
- Georgian
- German
- Hungarian
- Icelandic
- Indonesian
- Korean
- Latvian
- Lithuanian
- Persian
- Polish
- Portuguese
- Russian
- Serbian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.7.2, 10-08-2022
-========================================
-
-* GtkTextView:
- - Fix child positioning with gutters
-
-* GtkText:
- - Update placeholder visibility when necessary
-
-* GtkPicture:
- - Add a content-fit property
-
-* GtkPopover:
- - Fix a size allocation problem with the arrow
-
-* GtkTreeView:
- - Fix a problem with DND
-
-* GtkTreePopover:
- - Support scrolling
-
-* GtkGridView:
- - Fix issues with rubberband selection
-
-* GtkLabel:
- - Add a tabs property
-
-* GtkSnapshot:
- - Make GtkSnapshot work from bindings
-
-* GtkScrolledWindow:
- - Scroll at a reasonable speed
-
-* GtkPaned:
- - Avoid an infinite loop
-
-* GtkWindow:
- - Improve generation and handling of crossing events
-
-* CSS:
- - Fix handling of certain transform values
-
-* Media support:
- - Add audio support to the ffmpeg backend
- - Avoid oom with pathological jpeg images
-
-* GDK:
- - Fix handling of touchpad hold events
- - Add support for hi-resolution scroll events
-
-* X11:
- - Fix preferred action for DND
-
-* Windows:
- - Fix DND
-
-* List models:
- - Fix items-changed emission
- - Add more list model tests
-
-* Demos:
- - Add a winning sound to game demos
- - Make app icons work uninstalled
-
-* Translation updates:
- Abkhazian
- Basque
- Catalan
- Georgian
- German
- Indonesian
- Occitan
- Persian
- Portuguese
- Russian
- Spanish
- Ukrainian
-
-
-Overview of Changes in 4.7.1, 12-07-2022
-========================================
-
-* GtkInscription:
- - A new label-like widget for use in list views
-
-* GtkColorChooser:
- - Style improvements
-
-* GtkFontChooser:
- - Improve support for OpenType features a bit
-
-* GtkLabel:
- - Allow selectable labels to be activated via mnemonic
-
-* GtkTextView:
- - Implement GetCharacterExtents for accessibility
-
-* GtkStack:
- - Fix a poblem with stack page accessibility
-
-* GtkListView:
- - Cull listitems that are out of view
- - Make all our list models implement ::n-items and
-   ::item-type properties
-
-* Translations:
- - Stop translating property nicks and blurbs
- - Fix extracting translations from ui files
-
-* Debugging:
- - Support GTK_DEBUG=invert-text-dir
- - Allow inspecting inspectors
- - Replace GTK_USE_PORTAL with GDK_DEBUG=portals
- - Improve responsiveness of the inspector
-
-* CSS:
- - Allow fractional letterspacing
-
-* Theme:
- - Improve legibility of selectable labels
-
-* Demos:
- - Improve the font features demo
- - Add demos for GtkInscription
-
-* Wayland:
- - Freeze popups when hidden
- - Only send smooth scroll events for tablet tools
- - Make scaled cursor image have the right size
- - Fix problems with the activation protocol
- - Don't force the HighContrast icon theme
- - Support xdg_toplevel.bounds
-
-* X11:
- - Always update the shadoe size
-
-* Windows:
- - Improve touchpad support by using DirectManipulation
- - Add more directories to the builtin hicolor icon theme
-
-* Translation updates:
- Basque
- Catalan
- Chinese (China)
- Galician
- German
- Lithuanian
- Nepali
- Occitan
- Persian
- Polish
- Portuguese
- Russian
- Serbian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
 Overview of Changes in 4.7.0, 07-05-2022
 ========================================
 

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

@@ -54,7 +54,8 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dtests=false"
+                "-Dtests=false",
+                "-Dbenchmarks=false"
             ],
             "sources" : [
                 {
@@ -104,8 +105,8 @@
              "sources": [
                  {
                      "type": "archive",
-                     "url": "https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2",
-                     "sha256": "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39"
+                     "url": "https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source/boost_1_69_0.tar.bz2",
+                     "sha256": "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"
                  }
             ]
         },
@@ -185,7 +186,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dvulkan=disabled",
+                "-Denable_vulkan=no",
                 "-Dbuildtype=debugoptimized",
                 "-Dprofile=devel"
             ],

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

@@ -54,7 +54,8 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dtests=false"
+                "-Dtests=false",
+                "-Dbenchmarks=false"
             ],
             "sources" : [
                 {
@@ -114,7 +115,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dvulkan=disabled",
+                "-Denable_vulkan=no",
                 "-Dbuildtype=debugoptimized",
                 "-Dprofile=devel"
             ],

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

@@ -54,7 +54,8 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dtests=false"
+                "-Dtests=false",
+                "-Dbenchmarks=false"
             ],
             "sources" : [
                 {
@@ -114,7 +115,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dvulkan=disabled",
+                "-Denable_vulkan=no",
                 "-Dbuildtype=debugoptimized",
                 "-Dprofile=devel"
             ],

build-aux/flatpak/org.gtk.gtk4.NodeEditor.json

@@ -1,138 +0,0 @@
-{
-    "app-id" : "org.gtk.gtk4.NodeEditor",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-node-editor",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
-    ],
-    "cleanup" : [
-        "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
-        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "*.la",
-        ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules" : [
-        {
-            "name" : "wayland",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "-Ddocumentation=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
-                }
-            ]
-        },
-        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Dtests=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name" : "libsass",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/libsass.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "sassc",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/sassc.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "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",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Dvulkan=disabled",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
-                }
-            ]
-        }
-    ],
-    "build-options" : {
-        "env" : {
-            "DBUS_SESSION_BUS_ADDRESS" : "''",
-            "GSK_RENDERER" : "opengl",
-            "GDK_DEBUG" : "vulkan-disable",
-            "G_ENABLE_DEBUG" : "true"
-        }
-    }
-}

build-aux/meson/post-install.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import subprocess
+
+if 'DESTDIR' not in os.environ:
+    gtk_api_version = sys.argv[1]
+    gtk_abi_version = sys.argv[2]
+    gtk_libdir = sys.argv[3]
+    gtk_datadir = sys.argv[4]
+    gtk_bindir = sys.argv[5]
+
+    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')
+
+    print('Compiling GSettings schemas...')
+    glib_compile_schemas = subprocess.check_output(['pkg-config',
+                                                   '--variable=glib_compile_schemas',
+                                                   'gio-2.0']).strip()
+    if not os.path.exists(glib_compile_schemas):
+        # pkg-config variables only available since GLib 2.62.0.
+        glib_compile_schemas = 'glib-compile-schemas'
+    subprocess.call([glib_compile_schemas,
+                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
+
+    print('Updating icon cache...')
+    update_icon_cache = os.path.join(gtk_bindir, 'gtk4-update-icon-cache')
+    subprocess.call([update_icon_cache, '-q', '-t' ,'-f',
+                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
+
+    print('Updating module cache for print backends...')
+    os.makedirs(gtk_printmodule_dir, exist_ok=True)
+    gio_querymodules = subprocess.check_output(['pkg-config',
+                                                '--variable=gio_querymodules',
+                                                'gio-2.0']).strip()
+    if not os.path.exists(gio_querymodules):
+        # pkg-config variables only available since GLib 2.62.0.
+        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])

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

@@ -361,11 +361,11 @@ save_cb (GtkWidget              *button,
 }
 
 static void
-constraint_editor_window_dispose (GObject *object)
+constraint_editor_window_finalize (GObject *object)
 {
-  gtk_widget_dispose_template (GTK_WIDGET (object), CONSTRAINT_EDITOR_WINDOW_TYPE);
+  //ConstraintEditorWindow *self = (ConstraintEditorWindow *)object;
 
-  G_OBJECT_CLASS (constraint_editor_window_parent_class)->dispose (object);
+  G_OBJECT_CLASS (constraint_editor_window_parent_class)->finalize (object);
 }
 
 static int child_counter;
@@ -497,7 +497,7 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  object_class->dispose = constraint_editor_window_dispose;
+  object_class->finalize = constraint_editor_window_finalize;
 
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gtk/gtk4/constraint-editor/constraint-editor-window.ui");

demos/constraint-editor/constraint-editor.c

@@ -607,11 +607,10 @@ constraint_editor_dispose (GObject *object)
 {
   ConstraintEditor *self = (ConstraintEditor *)object;
 
+  g_clear_pointer (&self->grid, gtk_widget_unparent);
   g_clear_object (&self->model);
   g_clear_object (&self->constraint);
 
-  gtk_widget_dispose_template (GTK_WIDGET (object), CONSTRAINT_EDITOR_TYPE);
-
   G_OBJECT_CLASS (constraint_editor_parent_class)->dispose (object);
 }
 

demos/constraint-editor/guide-editor.c

@@ -294,10 +294,9 @@ guide_editor_dispose (GObject *object)
 {
   GuideEditor *self = (GuideEditor *)object;
 
+  g_clear_pointer (&self->grid, gtk_widget_unparent);
   g_clear_object (&self->guide);
 
-  gtk_widget_dispose_template (GTK_WIDGET (self), GUIDE_EDITOR_TYPE);
-
   G_OBJECT_CLASS (guide_editor_parent_class)->dispose (object);
 }
 

demos/gtk-demo/application.c

@@ -504,8 +504,6 @@ demo_application_window_dispose (GObject *object)
 
   demo_application_window_store_state (window);
 
-  gtk_widget_dispose_template (GTK_WIDGET (window), demo_application_window_get_type ());
-
   G_OBJECT_CLASS (demo_application_window_parent_class)->dispose (object);
 }
 

demos/gtk-demo/clipboard.c

@@ -341,13 +341,16 @@ do_clipboard (GtkWidget *do_widget)
       GtkWidget *button;
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, copy_button_clicked);
-      gtk_builder_cscope_add_callback (scope, paste_button_clicked);
-      gtk_builder_cscope_add_callback (scope, source_changed_cb);
-      gtk_builder_cscope_add_callback (scope, text_changed_cb);
-      gtk_builder_cscope_add_callback (scope, open_file_cb);
-      gtk_builder_cscope_add_callback (scope, on_drop);
-      gtk_builder_cscope_add_callback (scope, drag_prepare);
+      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);

demos/gtk-demo/demo.gresource.xml

@@ -329,7 +329,6 @@
     <file>pickers.c</file>
     <file>printing.c</file>
     <file>revealer.c</file>
-    <file>read_more.c</file>
     <file>rotated_text.c</file>
     <file>scale.c</file>
     <file>search_entry.c</file>
@@ -376,7 +375,7 @@
     <file>glarea-gles.vs.glsl</file>
   </gresource>
   <gresource prefix="/font_features">
-    <file>font_features.ui</file>
+    <file>font-features.ui</file>
     <file>fontplane.c</file>
   </gresource>
   <gresource prefix="/spinbutton">
@@ -428,8 +427,6 @@
     <file>icons/16x16/emotes/face-laugh-symbolic.symbolic.png</file>
     <file>icons/16x16/status/battery-caution-charging-symbolic.symbolic.png</file>
     <file>icons/16x16/categories/applications-other.png</file>
-    <file>icons/48x48/status/starred.png</file>
-    <file alias="icons/scalable/apps/org.gtk.Demo4.svg">data/scalable/apps/org.gtk.Demo4.svg</file>
   </gresource>
   <gresource prefix="/org/gtk/Demo4/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>

demos/gtk-demo/demo3widget.c

@@ -37,8 +37,7 @@ demo3_widget_dispose (GObject *object)
   Demo3Widget *self = DEMO3_WIDGET (object);
 
   g_clear_object (&self->paintable);
-
-  gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);
+  g_clear_pointer (&self->menu, gtk_widget_unparent);
 
   G_OBJECT_CLASS (demo3_widget_parent_class)->dispose (object);
 }

demos/gtk-demo/errorstates.c

@@ -90,9 +90,12 @@ do_errorstates (GtkWidget *do_widget)
       toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, validate_more_details);
-      gtk_builder_cscope_add_callback (scope, mode_switch_state_set);
-      gtk_builder_cscope_add_callback (scope, level_scale_value_changed);
+      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
+              "validate_more_details", G_CALLBACK (validate_more_details),
+              "mode_switch_state_set", G_CALLBACK (mode_switch_state_set),
+              "level_scale_value_changed", G_CALLBACK (level_scale_value_changed),
+              NULL);
+
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);
       gtk_builder_expose_object (builder, "toplevel", G_OBJECT (toplevel));

demos/gtk-demo/font-features.ui

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow" id="window">
+    <property name="default-width">600</property>
+    <property name="default-height">500</property>
+    <property name="title">Font Explorer</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <child>
+          <object class="GtkButton" id="reset">
+            <property name="receives-default">1</property>
+            <property name="tooltip-text">Reset</property>
+            <property name="icon-name">view-refresh-symbolic</property>
+            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="hscrollbar-policy">never</property>
+            <child>
+              <object class="GtkViewport">
+                <child>
+                  <object class="GtkBox">
+                    <property name="margin-start">10</property>
+                    <property name="margin-end">10</property>
+                    <property name="margin-top">10</property>
+                    <property name="margin-bottom">10</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkFontButton" id="font">
+                        <property name="receives-default">1</property>
+                        <property name="font">Sans 12</property>
+                        <property name="level">family|style|size|variations|features</property>
+                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkExpander">
+                        <child type="label">
+                          <object class="GtkLabel">
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Font Features</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"></attribute>
+                            </attributes>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="feature_list">
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkComboBox" id="script_lang">
+                                <property name="margin-top">10</property>
+                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
+                                <child>
+                                  <object class="GtkCellRendererText"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkExpander">
+                        <child type="label">
+                          <object class="GtkLabel" id="variations_heading">
+                            <property name="label" translatable="yes">Font Variations</property>
+                            <property name="xalign">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"></attribute>
+                            </attributes>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkGrid" id="variations_grid">
+                            <property name="column-spacing">10</property>
+                            <property name="row-spacing">10</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <style>
+                  <class name="view"/>
+                </style>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">20</property>
+            <property name="margin-top">20</property>
+            <property name="margin-bottom">20</property>
+            <property name="spacing">20</property>
+            <child>
+              <object class="GtkStack" id="stack">
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">label</property>
+                    <property name="child">
+                      <object class="GtkLabel" id="label">
+                        <property name="wrap">1</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="valign">start</property>
+                        <property name="selectable">1</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">entry</property>
+                    <property name="child">
+                      <object class="GtkEntry" id="entry">
+                        <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
+
+Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
+
+Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
+                        <signal name="activate" handler="font_features_stop_edit"/>
+                        <property name="valign">start</property>
+                        <property name="width-chars">50</property>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="settings">
+                <property name="wrap">1</property>
+                <property name="xalign">0</property>
+                <property name="valign">end</property>
+                <property name="width-chars">50</property>
+                <property name="max-width-chars">50</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <style>
+                  <class name="monospace"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="spacing">10</property>
+                <child>
+                  <object class="GtkLabel" id="description">
+                    <property name="wrap">1</property>
+                    <property name="xalign">0</property>
+                    <property name="valign">end</property>
+                    <property name="width-chars">50</property>
+                    <property name="max-width-chars">50</property>
+                    <property name="hexpand">1</property>
+                    <style>
+                      <class name="monospace"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton" id="edit_toggle">
+                    <property name="icon-name">document-edit-symbolic</property>
+                    <property name="halign">end</property>
+                    <property name="valign">end</property>
+                    <signal name="toggled" handler="font_features_toggle_edit"/>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/font_features.ui

@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAdjustment" id="size_adjustment">
-    <property name="lower">7</property>
-    <property name="upper">100</property>
-    <property name="value">14</property>
-    <property name="step_increment">0.5</property>
-    <property name="page_increment">10</property>
-    <signal name="value-changed" handler="basic_value_changed" object="size_entry" swapped="false"/>
-  </object>
-  <object class="GtkAdjustment" id="letterspacing_adjustment">
-    <property name="lower">-1024</property>
-    <property name="upper">8192</property>
-    <property name="value">0</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">512</property>
-    <signal name="value-changed" handler="basic_value_changed" object="letterspacing_entry" swapped="false"/>
-  </object>
-  <object class="GtkAdjustment" id="line_height_adjustment">
-    <property name="lower">0.75</property>
-    <property name="upper">2.5</property>
-    <property name="value">1.0</property>
-    <property name="step_increment">0.1</property>
-    <property name="page_increment">1</property>
-    <signal name="value-changed" handler="basic_value_changed" object="line_height_entry" swapped="false"/>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="default-width">600</property>
-    <property name="default-height">500</property>
-    <property name="title">Font Explorer</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <child>
-          <object class="GtkButton" id="reset">
-            <property name="receives-default">1</property>
-            <property name="tooltip-text">Reset</property>
-            <property name="icon-name">view-refresh-symbolic</property>
-            <signal name="clicked" handler="font_features_reset_basic" swapped="no"/>
-            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
-            <signal name="clicked" handler="font_features_reset_variations" swapped="no"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <child>
-          <object class="GtkScrolledWindow">
-            <property name="hscrollbar-policy">never</property>
-            <child>
-              <object class="GtkViewport">
-                <child>
-                  <object class="GtkBox">
-                    <property name="margin-start">10</property>
-                    <property name="margin-end">10</property>
-                    <property name="margin-top">10</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkFontButton" id="font">
-                        <property name="receives-default">1</property>
-                        <property name="font">Sans 12</property>
-                        <property name="level">family|style</property>
-                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkGrid">
-                        <property name="column-spacing">10</property>
-                        <property name="row-spacing">10</property>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Size</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScale" id="size_scale">
-                            <property name="hexpand">1</property>
-                            <property name="width-request">100</property>
-                            <property name="valign">baseline</property>
-                            <property name="adjustment">size_adjustment</property>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="size_entry">
-                            <property name="width-chars">4</property>
-                            <property name="max-width-chars">4</property>
-                            <property name="hexpand">0</property>
-                            <property name="valign">baseline</property>
-                            <signal name="activate" handler="basic_entry_activated"
-                                    object="size_adjustment" swapped="false"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Letterspacing</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScale">
-                            <property name="hexpand">1</property>
-                            <property name="width-request">100</property>
-                            <property name="valign">baseline</property>
-                            <property name="adjustment">letterspacing_adjustment</property>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="letterspacing_entry">
-                            <property name="width-chars">4</property>
-                            <property name="max-width-chars">4</property>
-                            <property name="hexpand">0</property>
-                            <property name="valign">baseline</property>
-                            <signal name="activate" handler="basic_entry_activated"
-                                    object="letterspacing_adjustment" swapped="false"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Line Height</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkScale">
-                            <property name="hexpand">1</property>
-                            <property name="width-request">100</property>
-                            <property name="valign">baseline</property>
-                            <property name="adjustment">line_height_adjustment</property>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="line_height_entry">
-                            <property name="width-chars">4</property>
-                            <property name="max-width-chars">4</property>
-                            <property name="hexpand">0</property>
-                            <property name="valign">baseline</property>
-                            <signal name="activate" handler="basic_entry_activated"
-                                    object="line_height_adjustment" swapped="false"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Foreground</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">3</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkColorButton" id="foreground">
-                            <property name="valign">baseline</property>
-                            <property name="rgba">black</property>
-                            <signal name="notify::rgba" handler="color_set_cb"/>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">3</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label">Background</property>
-                            <property name="xalign">0</property>
-                            <property name="valign">baseline</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">4</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkColorButton" id="background">
-                            <property name="valign">baseline</property>
-                            <property name="rgba">white</property>
-                            <signal name="notify::rgba" handler="color_set_cb"/>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">4</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton">
-                            <property name="icon-name">object-flip-vertical-symbolic</property>
-                            <property name="halign">start</property>
-                            <property name="valign">center</property>
-                            <style>
-                              <class name="circular"/>
-                            </style>
-                            <signal name="clicked" handler="swap_colors"/>
-                            <layout>
-                              <property name="column">2</property>
-                              <property name="row">3</property>
-                              <property name="row-span">2</property>
-                            </layout>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkExpander">
-                        <child type="label">
-                          <object class="GtkLabel">
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">OpenType Features</property>
-                            <property name="margin-top">10</property>
-                            <property name="margin-bottom">10</property>
-                            <style>
-                              <class name="title-4"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="feature_list">
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkComboBox" id="script_lang">
-                                <property name="tooltip-text" translatable="yes">Language System</property>
-                                <property name="margin-top">10</property>
-                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
-                                <child>
-                                  <object class="GtkCellRendererText"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkExpander">
-                        <child type="label">
-                          <object class="GtkLabel" id="variations_heading">
-                            <property name="label" translatable="yes">Variation Axes</property>
-                            <property name="xalign">0</property>
-                            <property name="margin-top">10</property>
-                            <property name="margin-bottom">10</property>
-                            <style>
-                              <class name="title-4"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="variations_grid">
-                            <property name="column-spacing">10</property>
-                            <property name="row-spacing">10</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <style>
-                  <class name="view"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="margin-top">20</property>
-            <property name="margin-bottom">20</property>
-            <property name="spacing">20</property>
-            <child>
-              <object class="GtkScrolledWindow" id="swin">
-                <property name="hscrollbar-policy">automatic</property>
-                <property name="vscrollbar-policy">automatic</property>
-                <property name="propagate-natural-height">1</property>
-                <property name="vexpand">1</property>
-                <style>
-                  <class name="font_features_background"/>
-                </style>
-                <child>
-                  <object class="GtkStack" id="stack">
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">label</property>
-                        <property name="child">
-                          <object class="GtkLabel" id="label">
-                            <property name="wrap">1</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                            <property name="valign">start</property>
-                            <property name="selectable">1</property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">entry</property>
-                        <property name="child">
-                          <object class="GtkTextView" id="entry">
-                            <property name="buffer">
-                              <object class="GtkTextBuffer">
-                                <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
-
-    Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
-
-    Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
-                              </object>
-                            </property>
-                            <property name="valign">fill</property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel" id="settings">
-                    <property name="wrap">1</property>
-                    <property name="xalign">0</property>
-                    <property name="valign">end</property>
-                    <property name="width-chars">50</property>
-                    <property name="max-width-chars">50</property>
-                    <property name="hexpand">1</property>
-                    <style>
-                      <class name="monospace"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label" translatable="yes">Alphabet</property>
-                    <signal name="clicked" handler="set_text_alphabet"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label" translatable="yes">Paragraph</property>
-                    <signal name="clicked" handler="set_text_paragraph"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel" id="description">
-                    <property name="wrap">1</property>
-                    <property name="wrap-mode">char</property>
-                    <property name="xalign">0</property>
-                    <property name="valign">end</property>
-                    <property name="width-chars">50</property>
-                    <property name="max-width-chars">50</property>
-                    <property name="hexpand">1</property>
-                    <style>
-                      <class name="monospace"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="linked"/>
-                    </style>
-                    <property name="valign">end</property>
-                    <child>
-                      <object class="GtkToggleButton" id="plain_toggle">
-                        <property name="label" translatable="yes">Plain</property>
-                        <property name="active">1</property>
-                        <property name="valign">baseline</property>
-                        <signal name="toggled" handler="font_features_toggle_plain"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkToggleButton" id="waterfall_toggle">
-                        <property name="label" translatable="yes">Waterfall</property>
-                        <property name="valign">baseline</property>
-                        <property name="group">plain_toggle</property>
-                        <signal name="toggled" handler="font_features_toggle_plain"/>
-                        <signal name="notify::active" handler="font_features_notify_waterfall"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkToggleButton" id="edit_toggle">
-                    <property name="group">waterfall_toggle</property>
-                    <property name="icon-name">document-edit-symbolic</property>
-                    <property name="halign">end</property>
-                    <property name="valign">end</property>
-                    <signal name="clicked" handler="font_features_toggle_edit"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/fontrendering.c

@@ -217,39 +217,30 @@ update_image (void)
         text = " ";
 
       ch = g_utf8_get_char (text);
-      str = g_string_new ("");
-      layout = pango_layout_new (context);
 
-retry:
+      str = g_string_new ("");
+
       for (i = 0; i < 4; i++)
         {
           g_string_append_unichar (str, ch);
           g_string_append_unichar (str, 0x200c);
         }
 
+      layout = pango_layout_new (context);
       pango_layout_set_font_description (layout, desc);
       pango_layout_set_text (layout, str->str, -1);
+      g_string_free (str, TRUE);
       pango_layout_get_extents (layout, &ink, &logical);
       pango_extents_to_pixels (&logical, NULL);
 
-      iter = pango_layout_get_iter (layout);
-      run = pango_layout_iter_get_run (iter);
-
-      if (run->glyphs->num_glyphs < 8)
-        {
-          /* not a good char to use */
-          g_string_truncate (str, 0);
-          ch = 'a';
-          goto retry;
-        }
-
-      g_string_free (str, TRUE);
-
       surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, logical.width * 3 / 2, 4*logical.height);
       cr = cairo_create (surface);
       cairo_set_source_rgb (cr, 1, 1, 1);
       cairo_paint (cr);
 
+      iter = pango_layout_get_iter (layout);
+      run = pango_layout_iter_get_run (iter);
+
       cairo_set_source_rgb (cr, 0, 0, 0);
       for (i = 0; i < 4; i++)
         {

demos/gtk-demo/gtkgears.c

@@ -223,7 +223,6 @@ static void
 destroy_gear (struct gear *g)
 {
   g_free (g->strips);
-  g_free (g->vertices);
   g_free (g);
 }
 

demos/gtk-demo/listbox.c

@@ -260,19 +260,12 @@ gtk_message_row_state_flags_changed (GtkWidget    *widget,
   GTK_WIDGET_CLASS (gtk_message_row_parent_class)->state_flags_changed (widget, previous_state_flags);
 }
 
-static void
-gtk_message_row_dispose (GObject *obj)
-{
-  gtk_widget_dispose_template (GTK_WIDGET (obj), GTK_TYPE_MESSAGE_ROW);
-  G_OBJECT_CLASS (gtk_message_row_parent_class)->dispose (obj);
-}
-
 static void
 gtk_message_row_finalize (GObject *obj)
 {
   GtkMessageRowPrivate *priv = GTK_MESSAGE_ROW (obj)->priv;
   g_object_unref (priv->message);
-  G_OBJECT_CLASS (gtk_message_row_parent_class)->finalize (obj);
+  G_OBJECT_CLASS (gtk_message_row_parent_class)->finalize(obj);
 }
 
 static void
@@ -281,7 +274,6 @@ gtk_message_row_class_init (GtkMessageRowClass *klass)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->dispose = gtk_message_row_dispose;
   object_class->finalize = gtk_message_row_finalize;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/listbox/listbox.ui");

demos/gtk-demo/listbox_controls.c

@@ -42,7 +42,8 @@ do_listbox_controls (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, row_activated);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope),
+                                              "row_activated", G_CALLBACK (row_activated));
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);
 

demos/gtk-demo/listview_minesweeper.c

@@ -8,7 +8,6 @@
  * to implement rather different interaction behavior to a typical list.
  */
 
-#include "config.h"
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
@@ -376,23 +375,6 @@ sweeper_game_init (SweeperGame *self)
   sweeper_game_new_game (self, 8, 8, 10);
 }
 
-static void
-celebrate (gboolean win)
-{
-  char *path;
-  GtkMediaStream *stream;
-
-  if (win)
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "complete.oga", NULL);
-  else
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "suspend-error.oga", NULL);
-  stream = gtk_media_file_new_for_filename (path);
-  gtk_media_stream_set_volume (stream, 1.0);
-  gtk_media_stream_play (stream);
-  g_signal_connect (stream, "notify::ended", G_CALLBACK (g_object_unref), NULL);
-  g_free (path);
-}
-
 static void
 sweeper_game_end (SweeperGame *self,
                   gboolean     win)
@@ -401,9 +383,7 @@ sweeper_game_end (SweeperGame *self,
     {
       self->playing = FALSE;
       g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
-      celebrate (win);
     }
-
   if (self->win != win)
     {
       self->win = win;

demos/gtk-demo/listview_settings.c

@@ -356,10 +356,10 @@ do_listview_settings (GtkWidget *do_widget)
       g_type_ensure (SETTINGS_TYPE_KEY);
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, search_enabled);
-      gtk_builder_cscope_add_callback (scope, search_changed);
-      gtk_builder_cscope_add_callback (scope, stop_search);
-      gtk_builder_cscope_add_callback (scope, item_value_changed);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_enabled", (GCallback)search_enabled);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_changed", (GCallback)search_changed);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "stop_search", (GCallback)stop_search);
+      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "item_value_changed", (GCallback)item_value_changed);
 
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);

demos/gtk-demo/listview_words.c

@@ -1,5 +1,5 @@
 /* Lists/Words
- * #Keywords: GtkListView, GtkFilterListModel, GtkInscription
+ * #Keywords: GtkListView, GtkFilterListModel
  *
  * This demo shows filtering a long list - of words.
  *
@@ -17,9 +17,10 @@ const char *factory_text =
 "<interface>\n"
 "  <template class='GtkListItem'>\n"
 "    <property name='child'>\n"
-"      <object class='GtkInscription'>\n"
+"      <object class='GtkLabel'>\n"
+"        <property name='ellipsize'>end</property>\n"
 "        <property name='xalign'>0</property>\n"
-"        <binding name='text'>\n"
+"        <binding name='label'>\n"
 "          <lookup name='string' type='GtkStringObject'>\n"
 "            <lookup name='item'>GtkListItem</lookup>\n"
 "          </lookup>\n"

demos/gtk-demo/main-listitem.ui

@@ -7,9 +7,9 @@
           <lookup name="item">GtkListItem</lookup>
         </binding>
         <property name="child">
-          <object class="GtkInscription">
-            <property name="hexpand">1</property>
-            <binding name="text">
+          <object class="GtkLabel">
+            <property name="halign">start</property>
+            <binding name="label">
               <lookup name="title" type="GtkDemo">
                 <lookup name="item">expander</lookup>
               </lookup>

demos/gtk-demo/meson.build

@@ -73,7 +73,6 @@ demos = files([
   'peg_solitaire.c',
   'pickers.c',
   'printing.c',
-  'read_more.c',
   'revealer.c',
   'rotated_text.c',
   'scale.c',

demos/gtk-demo/peg_solitaire.c

@@ -119,6 +119,12 @@ solitaire_peg_new (void)
 
 /*** Helper for finding a win ***/
 
+static void
+ended (GObject *object)
+{
+  g_object_unref (object);
+}
+
 static void
 celebrate (gboolean win)
 {
@@ -128,12 +134,12 @@ celebrate (gboolean win)
   if (win)
     path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "complete.oga", NULL);
   else
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "suspend-error.oga", NULL);
+    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "dialog-error.oga", NULL);
   stream = gtk_media_file_new_for_filename (path);
   gtk_media_stream_set_volume (stream, 1.0);
   gtk_media_stream_play (stream);
 
-  g_signal_connect (stream, "notify::ended", G_CALLBACK (g_object_unref), NULL);
+  g_signal_connect (stream, "notify::ended", G_CALLBACK (ended), NULL);
   g_free (path);
 }
 

demos/gtk-demo/pickers.c

@@ -2,7 +2,7 @@
  * #Keywords: GtkColorChooser, GtkFontChooser, GtkApplicationChooser
  *
  * These widgets are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts and applications.
+ * They allow to select colors, fonts, directories and applications.
  *
  * This demo shows both the default appearance for these dialogs,
  * as well as some of the customizations that are possible.

demos/gtk-demo/read_more.c

@@ -1,239 +0,0 @@
-/* Read More
- * #Keywords: GtkInscription
- *
- * A simple implementation of a widget that can either
- * display a lot of text or just the first few lines with a
- * "Read More" button.
- */
-
-#include <gtk/gtk.h>
-
-#define READ_TYPE_MORE (read_more_get_type ())
-G_DECLARE_FINAL_TYPE(ReadMore, read_more, READ, MORE, GtkWidget)
-
-struct _ReadMore {
-  GtkWidget parent_instance;
- 
-  GtkWidget *label;
-  GtkWidget *inscription;
-  GtkWidget *box;
-  gboolean show_more;
-};
-
-G_DEFINE_TYPE (ReadMore, read_more, GTK_TYPE_WIDGET)
-
-static GtkSizeRequestMode
-read_more_get_request_mode (GtkWidget *widget)
-{
-  return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
-}
-
-static void
-read_more_measure (GtkWidget      *widget,
-                   GtkOrientation  orientation,
-                   int             for_size,
-                   int            *minimum,
-                   int            *natural,
-                   int            *minimum_baseline,
-                   int            *natural_baseline)
-{
-  ReadMore *self = READ_MORE (widget);
-  int label_min, label_nat, label_min_baseline, label_nat_baseline;
-  int box_min, box_nat, box_min_baseline, box_nat_baseline;
-  int min_check;
-
-  if (self->show_more)
-    min_check = G_MAXINT;
-  else if (for_size >= 0)
-    gtk_widget_measure (self->box, 1 - orientation, -1, &min_check, NULL, NULL, NULL);
-  else
-    min_check = -1;
-
-  if (min_check > for_size)
-    {
-      gtk_widget_measure (self->label,
-                          orientation,
-                          for_size,
-                          minimum, natural,
-                          minimum_baseline, natural_baseline);
-      return;
-    }
-
-  else if (for_size >= 0)
-    gtk_widget_measure (self->label, 1 - orientation, -1, &min_check, NULL, NULL, NULL);
-  else
-    min_check = -1;
-
-  if (min_check > for_size)
-    {
-      gtk_widget_measure (self->box,
-                          orientation,
-                          for_size,
-                          minimum, natural,
-                          minimum_baseline, natural_baseline);
-      return;
-    }
-
-  gtk_widget_measure (self->label,
-                      orientation,
-                      for_size,
-                      &label_min, &label_nat,
-                      &label_min_baseline, &label_nat_baseline);
-  gtk_widget_measure (self->box,
-                      orientation,
-                      for_size,
-                      &box_min, &box_nat,
-                      &box_min_baseline, &box_nat_baseline);
-
-  *minimum = MIN (label_min, box_min);
-  *natural = MIN (label_nat, box_nat);
-
-  /* FIXME: Figure out baselines! */
-}
-
-static void
-read_more_allocate (GtkWidget *widget,
-                    int        width,
-                    int        height,
-                    int        baseline)
-{
-  ReadMore *self = READ_MORE (widget);
-  gboolean show_more;
-
-  if (self->show_more)
-    {
-      show_more = TRUE;
-    }
-  else
-    {
-      int needed;
-
-      /* check to see if we have enough space to show all text */
-      gtk_widget_measure (self->label,
-                          GTK_ORIENTATION_VERTICAL,
-                          width,
-                          &needed, NULL, NULL, NULL);
-
-      show_more = needed <= height;
-    }
-
-  gtk_widget_set_child_visible (self->label, show_more);
-  gtk_widget_set_child_visible (self->box, !show_more);
-
-  if (show_more)
-    gtk_widget_size_allocate (self->label, &(GtkAllocation) { 0, 0, width, height }, baseline);
-  else
-    gtk_widget_size_allocate (self->box, &(GtkAllocation) { 0, 0, width, height }, baseline);
-}
-
-static void
-read_more_dispose (GObject *object)
-{
-  ReadMore *self = READ_MORE (object);
-
-  g_clear_pointer (&self->label, gtk_widget_unparent);
-  g_clear_pointer (&self->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (read_more_parent_class)->dispose (object);
-}
-
-static void
-read_more_class_init (ReadMoreClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  widget_class->get_request_mode = read_more_get_request_mode;
-  widget_class->measure = read_more_measure;
-  widget_class->size_allocate = read_more_allocate;
-
-  object_class->dispose = read_more_dispose;
-}
-
-static void
-read_more_clicked (GtkButton *button,
-                   ReadMore  *self)
-{
-  self->show_more = TRUE;
-  gtk_widget_queue_resize (GTK_WIDGET (self));
-}
-
-static void
-read_more_init (ReadMore *self)
-{
-  GtkWidget *button;
-
-  self->label = gtk_label_new (NULL);
-  gtk_label_set_xalign (GTK_LABEL (self->label), 0.0);
-  gtk_label_set_yalign (GTK_LABEL (self->label), 0.0);
-  gtk_label_set_wrap (GTK_LABEL (self->label), TRUE);
-  gtk_label_set_width_chars (GTK_LABEL (self->label), 3);
-  gtk_label_set_max_width_chars (GTK_LABEL (self->label), 30);
-  gtk_widget_set_parent (self->label, GTK_WIDGET (self));
-
-  self->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_widget_set_vexpand (self->box, FALSE);
-  gtk_widget_set_parent (self->box, GTK_WIDGET (self));
-
-  self->inscription = gtk_inscription_new (NULL);
-  gtk_inscription_set_xalign (GTK_INSCRIPTION (self->inscription), 0.0);
-  gtk_inscription_set_yalign (GTK_INSCRIPTION (self->inscription), 0.0);
-  gtk_inscription_set_min_lines (GTK_INSCRIPTION (self->inscription), 3);
-  gtk_inscription_set_nat_chars (GTK_INSCRIPTION (self->inscription), 30);
-  gtk_widget_set_vexpand (self->inscription, TRUE);
-  gtk_box_append (GTK_BOX (self->box), self->inscription);
-  
-  button = gtk_button_new_with_label ("Read More");
-  g_signal_connect (button, "clicked", G_CALLBACK (read_more_clicked), self);
-  gtk_box_append (GTK_BOX (self->box), button);
-}
-
-static void
-read_more_set_text (ReadMore   *self,
-                    const char *text)
-{
-  gtk_label_set_label (GTK_LABEL (self->label), text);
-  gtk_inscription_set_text (GTK_INSCRIPTION (self->inscription), text);
-}
-
-static GtkWidget *
-read_more_new (const char *text)
-{
-  ReadMore *self = g_object_new (READ_TYPE_MORE, NULL);
-
-  read_more_set_text (self, text);
-
-  return GTK_WIDGET (self);
-}
-
-GtkWidget *
-do_read_more (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *readmore;
-
-      window = gtk_window_new ();
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Read More");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      readmore = read_more_new (
-"I'd just like to interject for a moment. What you're referring to as Linux, is in fact, GNU/Linux, or as I've recently taken to calling it, GNU plus Linux. Linux is not an operating system unto itself, but rather another free component of a fully functioning GNU system made useful by the GNU corelibs, shell utilities and vital system components comprising a full OS as defined by POSIX.\n"
-"\n"
-"Many computer users run a modified version of the GNU system every day, without realizing it. Through a peculiar turn of events, the version of GNU which is widely used today is often called \"Linux\", and many of its users are not aware that it is basically the GNU system, developed by the GNU Project.\n"
-"\n"
-"There really is a Linux, and these people are using it, but it is just a part of the system they use. Linux is the kernel: the program in the system that allocates the machine's resources to the other programs that you run. The kernel is an essential part of an operating system, but useless by itself; it can only function in the context of a complete operating system. Linux is normally used in combination with the GNU operating system: the whole system is basically GNU with Linux added, or GNU/Linux. All the so-called \"Linux\" distributions are really distributions of GNU/Linux.");
-      gtk_window_set_child (GTK_WINDOW (window), readmore);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/sliding_puzzle.c

@@ -5,7 +5,6 @@
  * small sliding puzzle game.
  */
 
-#include "config.h"
 #include <gtk/gtk.h>
 
 /* Include the header for the puzzle piece */
@@ -25,30 +24,6 @@ static guint height = 3;
 static guint pos_x;
 static guint pos_y;
 
-static void
-ended (GObject *object)
-{
-  g_object_unref (object);
-}
-
-static void
-celebrate (gboolean win)
-{
-  char *path;
-  GtkMediaStream *stream;
-
-  if (win)
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "complete.oga", NULL);
-  else
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "suspend-error.oga", NULL);
-  stream = gtk_media_file_new_for_filename (path);
-  gtk_media_stream_set_volume (stream, 1.0);
-  gtk_media_stream_play (stream);
-
-  g_signal_connect (stream, "notify::ended", G_CALLBACK (ended), NULL);
-  g_free (path);
-}
-
 static gboolean
 move_puzzle (GtkWidget *grid,
              int        dx,
@@ -182,8 +157,6 @@ check_solved (GtkWidget *grid)
   picture = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y);
   gtk_picture_set_paintable (GTK_PICTURE (picture), piece);
 
-  celebrate (TRUE);
-
   return TRUE;
 }
 
@@ -357,7 +330,7 @@ start_puzzle (GdkPaintable *paintable)
                                           x, y,
                                           width, height);
           picture = gtk_picture_new_for_paintable (piece);
-          gtk_picture_set_content_fit (GTK_PICTURE (picture), GTK_CONTENT_FIT_FILL);
+          gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE);
           gtk_grid_attach (GTK_GRID (grid),
                            picture,
                            x, y,

demos/gtk-demo/textview.c

@@ -137,7 +137,7 @@ insert_text (GtkTextView *view)
 
   icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
   icon = gtk_icon_theme_lookup_icon (icon_theme,
-                                     "drive-harddisk",
+                                     "face-cool",
                                      NULL,
                                      32, 1,
                                      gtk_widget_get_direction (widget),
@@ -239,6 +239,8 @@ insert_text (GtkTextView *view)
 
   gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
   gtk_text_buffer_insert_paintable (buffer, &iter, GDK_PAINTABLE (icon));
+  gtk_text_buffer_insert_paintable (buffer, &iter, GDK_PAINTABLE (icon));
+
   gtk_text_buffer_insert_paintable (buffer, &iter, nuclear);
 
   gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);
@@ -439,12 +441,11 @@ attach_widgets (GtkTextView *text_view)
         {
           widget = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
           gtk_range_set_range (GTK_RANGE (widget), 0, 100);
-          gtk_widget_set_size_request (widget, 100, -1);
+          gtk_widget_set_size_request (widget, 70, -1);
         }
       else if (i == 3)
         {
           widget = gtk_entry_new ();
-          gtk_editable_set_width_chars (GTK_EDITABLE (widget), 10);
         }
       else
         {

demos/icon-browser/iconbrowserwin.c

@@ -409,14 +409,6 @@ icon_browser_window_init (IconBrowserWindow *win)
   g_signal_connect (win->context_model, "notify::selected",  G_CALLBACK (selected_name_changed), win);
 }
 
-static void
-icon_browser_window_dispose (GObject *object)
-{
-  gtk_widget_dispose_template (GTK_WIDGET (object), ICON_BROWSER_WINDOW_TYPE);
-
-  G_OBJECT_CLASS (icon_browser_window_parent_class)->dispose (object);
-}
-
 static void
 icon_browser_window_finalize (GObject *object)
 {
@@ -432,7 +424,6 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-  object_class->dispose = icon_browser_window_dispose;
   object_class->finalize = icon_browser_window_finalize;
 
   g_type_ensure (IB_TYPE_ICON);

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

@@ -873,14 +873,6 @@ dark_mode_cb (GtkToggleButton *button,
                 NULL);
 }
 
-static void
-node_editor_window_dispose (GObject *object)
-{
-  gtk_widget_dispose_template (GTK_WIDGET (object), NODE_EDITOR_WINDOW_TYPE);
-
-  G_OBJECT_CLASS (node_editor_window_parent_class)->dispose (object);
-}
-
 static void
 node_editor_window_finalize (GObject *object)
 {
@@ -975,7 +967,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  object_class->dispose = node_editor_window_dispose;
   object_class->finalize = node_editor_window_finalize;
 
   gtk_widget_class_set_template_from_resource (widget_class,

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

@@ -216,6 +216,7 @@
                     <child>
                       <object class="GtkPicture" id="picture">
                         <property name="can-shrink">0</property>
+                        <property name="keep-aspect-ratio">1</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
                         <child>

demos/node-editor/node-format.md

@@ -13,8 +13,6 @@ Each node has its own `<node-name>` and supports a custom set of properties, eac
 
 When serializing and the value of a property equals the default value, this value will not be serialized. Serialization aims to produce an output as small as possible.
 
-To embed newlines in strings, use \A. To break a long string into multiple lines, escape the newline with a \.
-
 # Nodes
 
 ### container
@@ -137,23 +135,6 @@ Creates a node like `gsk_cross_fade_node_new()` with the given properties.
 
 Creates a node like `gsk_debug_node_new()` with the given properties.
 
-### glshader
-
-| property   | syntax             | default                | printed     |
-| ---------- | ------------------ | ---------------------- | ----------- |
-| bounds     | `<rect>`           | 50                     | always      |
-| sourcecode | `<string>`         | ""                     | always      |
-| args       | `<uniform values>` | none                   | non-default |
-| child1     | `<node>`           | none                   | non-default |
-| child2     | `<node>`           | none                   | non-default |
-| child3     | `<node>`           | none                   | non-default |
-| child4     | `<node>`           | none                   | non-default |
-
-Creates a GLShader node. The `sourcecode` must be a GLSL fragment shader.
-The `args` must match the uniforms of simple types declared in that shader,
-in order and comma-separated. The `child` properties must match the sampler
-uniforms in the shader.
-
 ### inset-shadow
 
 | property | syntax           | default                | printed     |
@@ -305,3 +286,20 @@ representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANS
 | transform| `<transform>`    | none                   | non-default |
 
 Creates a node like `gsk_transform_node_new()` with the given properties.
+
+### glshader
+
+| property   | syntax             | default                | printed     |
+| ---------- | ------------------ | ---------------------- | ----------- |
+| bounds     | `<rect>`           | 50                     | always      |
+| sourcecode | `<string>`         | ""                     | always      |
+| args       | `<uniform values>` | none                   | non-default |
+| child1     | `<node>`           | none                   | non-default |
+| child2     | `<node>`           | none                   | non-default |
+| child3     | `<node>`           | none                   | non-default |
+| child4     | `<node>`           | none                   | non-default |
+
+Creates a GLShader node. The `sourcecode` must be a GLSL fragment shader.
+The `args` must match the uniforms of simple types declared in that shader,
+in order and comma-separated. The `child` properties must match the sampler
+uniforms in the shader.

demos/widget-factory/widget-factory.c

@@ -213,31 +213,6 @@ activate_background (GSimpleAction *action,
   populate_flowbox (flowbox);
 }
 
-static void
-file_chooser_response (GtkNativeDialog *self,
-                       int              response)
-{
-  gtk_native_dialog_destroy (self);
-}
-
-static void
-activate_open_file (GSimpleAction *action,
-                    GVariant      *parameter,
-                    gpointer       user_data)
-{
-  GtkFileChooserNative *chooser;
-
-  chooser = gtk_file_chooser_native_new ("Open file",
-                                         NULL,
-                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                         "Open",
-                                         "Cancel");
-
-  g_signal_connect (chooser, "response", G_CALLBACK (file_chooser_response), NULL);
-
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (chooser));
-}
-
 static void
 activate_open (GSimpleAction *action,
                GVariant      *parameter,
@@ -2106,24 +2081,26 @@ activate (GApplication *app)
 
   builder = gtk_builder_new ();
   scope = gtk_builder_cscope_new ();
-  gtk_builder_cscope_add_callback (scope, on_entry_icon_release);
-  gtk_builder_cscope_add_callback (scope, on_scale_button_value_changed);
-  gtk_builder_cscope_add_callback (scope, on_record_button_toggled);
-  gtk_builder_cscope_add_callback (scope, on_page_combo_changed);
-  gtk_builder_cscope_add_callback (scope, on_range_from_changed);
-  gtk_builder_cscope_add_callback (scope, on_range_to_changed);
-  gtk_builder_cscope_add_callback (scope, on_picture_drag_prepare);
-  gtk_builder_cscope_add_callback (scope, on_picture_drop);
-  gtk_builder_cscope_add_callback (scope, tab_close_cb);
-  gtk_builder_cscope_add_callback (scope, increase_icon_size);
-  gtk_builder_cscope_add_callback (scope, decrease_icon_size);
-  gtk_builder_cscope_add_callback (scope, osd_frame_pressed);
-  gtk_builder_cscope_add_callback (scope, age_entry_changed);
-  gtk_builder_cscope_add_callback (scope, validate_more_details);
-  gtk_builder_cscope_add_callback (scope, mode_switch_state_set);
-  gtk_builder_cscope_add_callback (scope, level_scale_value_changed);
-  gtk_builder_cscope_add_callback (scope, transition_speed_changed);
-  gtk_builder_cscope_add_callback (scope, reset_icon_size);
+  gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
+          "on_entry_icon_release", (GCallback)on_entry_icon_release,
+          "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed,
+          "on_record_button_toggled", (GCallback)on_record_button_toggled,
+          "on_page_combo_changed", (GCallback)on_page_combo_changed,
+          "on_range_from_changed", (GCallback)on_range_from_changed,
+          "on_range_to_changed", (GCallback)on_range_to_changed,
+          "on_picture_drag_prepare", (GCallback)on_picture_drag_prepare,
+          "on_picture_drop", (GCallback)on_picture_drop,
+          "tab_close_cb", (GCallback)tab_close_cb,
+          "increase_icon_size", (GCallback)increase_icon_size,
+          "decrease_icon_size", (GCallback)decrease_icon_size,
+          "reset_icon_size", (GCallback)reset_icon_size,
+          "osd_frame_pressed", (GCallback)osd_frame_pressed,
+          "age_entry_changed", (GCallback)age_entry_changed,
+          "validate_more_details", (GCallback)validate_more_details,
+          "mode_switch_state_set", (GCallback)mode_switch_state_set,
+          "level_scale_value_changed", (GCallback)level_scale_value_changed,
+          "transition_speed_changed", (GCallback)transition_speed_changed,
+          NULL);
   gtk_builder_set_scope (builder, scope);
   g_object_unref (scope);
   if (!gtk_builder_add_from_resource (builder, "/org/gtk/WidgetFactory4/widget-factory.ui", &error))
@@ -2476,7 +2453,7 @@ main (int argc, char *argv[])
     { "share", activate_action, NULL, NULL, NULL },
     { "labels", activate_action, NULL, NULL, NULL },
     { "new", activate_action, NULL, NULL, NULL },
-    { "open", activate_open_file, NULL, NULL, NULL },
+    { "open", activate_action, NULL, NULL, NULL },
     { "open-in", activate_action, NULL, NULL, NULL },
     { "open-tab", activate_action, NULL, NULL, NULL },
     { "open-window", activate_action, NULL, NULL, NULL },

demos/widget-factory/widget-factory.gresource.xml

@@ -111,8 +111,6 @@
     <file>icons/scalable/status/weather-showers-symbolic.svg</file>
     <file>icons/scalable/status/weather-snow-symbolic.svg</file>
 
-    <file alias='icons/scalable/apps/org.gtk.WidgetFactory4.svg'>data/scalable/apps/org.gtk.WidgetFactory4.svg</file>
-
   </gresource>
   <gresource prefix="/org/gtk/WidgetFactory4">
     <file>gtk-logo.webm</file>

demos/widget-factory/widget-factory.ui

@@ -1265,7 +1265,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="child">
                                   <object class="GtkPicture">
                                     <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
-                                    <property name="content-fit">cover</property>
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>

docs/reference/gtk/running.md

@@ -10,10 +10,6 @@ to determine paths to look for certain files. The [X11](#x11-envar),
 [Broadway](#broadway-envar) GDK backends use some additional
 environment variables.
 
-Note that environment variables are generally used for debugging
-purposes. They are not guaranteed to be API stable, and should not
-be used for end-user configuration and customization.
-
 ### `GTK_DEBUG`
 
 This variable can be set to a list of debug options, which cause GTK to
@@ -79,9 +75,6 @@ A number of keys are influencing behavior instead of just logging:
 `snapshot`
 : Include debug render nodes in the generated snapshots
 
-`invert-text-dir`
-: Invert the text direction, compared to the locale
-
 The special value `all` can be used to turn on all debug options.
 The special value `help` can be used to obtain a list of all
 supported debug options.
@@ -212,33 +205,24 @@ A number of options affect behavior instead of logging:
 `gl-disable`
 : Disable OpenGL support
 
+`gl-software`
+: Force OpenGL software rendering
+
+`gl-texture-rect`
+: Use the OpenGL texture rectangle extension, if available
+
 `gl-legacy`
 : Use a legacy OpenGL context
 
 `gl-gles`
 : Use a GLES OpenGL context
 
-`gl-egl`
-: Use an EGL context on X11 or Windows
-
-`gl-glx`
-: Use GLX on X11
-
-`gl-wgl`
-: Use WGL on Windows
-
 `vulkan-disable`
 : Disable Vulkan support
 
 `vulkan-validate`
 : Load the Vulkan validation layer, if available
 
-`default-settings`
-: Force default values for xsettings
-
-`high-depth`
-: Use high bit depth rendering if possible
-
 The special value `all` can be used to turn on all debug options. The special
 value `help` can be used to obtain a list of all supported debug options.
 
@@ -355,20 +339,6 @@ using and the GDK backend supports them:
 `vulkan`
 : Selects the Vulkan renderer
 
-Note that on Windows, if one is running Nahimic 3 on a system with
-nVidia graphics, one needs to stop the "Nahimic service" or insert
-the GTK application into the Nahimic blacklist, as noted in
-https://www.nvidia.com/en-us/geforce/forums/game-ready-drivers/13/297952/nahimic-and-nvidia-drivers-conflict/2334568/, or use the cairo renderer (at the cost of being unable to use
-OpenGL features), or use GDK_DEBUG=gl-gles if you know that GLES
-support is enabled for the build.
-
-This is a known issue, as the above link indicates, and affects quite
-a number of applications--sadly, since this issue lies within the
-nVidia graphics driver and/or the Nahimic 3 code, we are not able
-to rememdy this on the GTK side; the best bet before trying the above
-workarounds is to try to update your graphics drivers and Nahimic
-installation.
-
 ### `GTK_CSD`
 
 The default value of this environment variable is `1`. If changed

docs/reference/gtk/windows.md

@@ -7,7 +7,7 @@ the default.
 
 More information about GTK on Windows, including detailed build
 instructions, binary downloads, etc, can be found
-[online](https://www.gtk.org/docs/installations/windows/).
+[online](https://wiki.gnome.org/Projects/GTK/Win32).
 
 ## Windows-specific environment variables
 

gdk/broadway/gdkbroadway-server.c

@@ -13,7 +13,7 @@
 #include "gdkbroadway-server.h"
 
 #include "gdkprivate-broadway.h"
-#include "gdkprivate.h"
+#include "gdk-private.h"
 
 #include <gdk/gdktextureprivate.h>
 
@@ -34,7 +34,7 @@
 #ifdef G_OS_WIN32
 #include <windows.h>
 #endif
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 
 typedef struct BroadwayInput BroadwayInput;
 

gdk/broadway/gdkdevice-broadway.c

@@ -84,7 +84,6 @@ gdk_broadway_device_query_state (GdkDevice         *device,
   gint32 device_root_x, device_root_y;
   guint32 mouse_toplevel_id;
   guint32 mask32;
-  int origin_x, origin_y;
 
   if (gdk_device_get_source (device) != GDK_SOURCE_MOUSE)
     return;
@@ -98,12 +97,10 @@ gdk_broadway_device_query_state (GdkDevice         *device,
                                     &device_root_y,
                                     &mask32);
 
-  gdk_surface_get_origin (surface, &origin_x, &origin_y);
-
   if (win_x)
-    *win_x = device_root_x - origin_x;
+    *win_x = device_root_x;
   if (win_y)
-    *win_y = device_root_y - origin_y;
+    *win_y = device_root_y;
   if (mask)
     *mask = mask32;
 }

gdk/broadway/gdkdisplay-broadway.c

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

gdk/broadway/gdksurface-broadway.c

@@ -47,10 +47,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if !GLIB_CHECK_VERSION (2, 67, 3)
-# define g_memdup2(mem,size)    g_memdup((mem), (size))
-#endif
-
 /* Forward declarations */
 static void        gdk_broadway_surface_finalize   (GObject            *object);
 

gdk/filetransferportal.c

@@ -97,7 +97,7 @@ add_files (GDBusProxy  *proxy,
            AddFileData *afd)
 {
   GUnixFDList *fd_list;
-  GVariantBuilder fds, options;
+  GVariantBuilder fds;
   int i;
   char *key;
 
@@ -146,10 +146,9 @@ add_files (GDBusProxy  *proxy,
 
   key = (char *)g_object_get_data (G_OBJECT (afd->task), "key");
 
-  g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
   g_dbus_proxy_call_with_unix_fd_list (proxy,
                                        "AddFiles",
-                                       g_variant_new ("(saha{sv})", key, &fds, &options),
+                                       g_variant_new ("(sah)", key, &fds),
                                        0, -1,
                                        fd_list,
                                        NULL,
@@ -481,36 +480,20 @@ connection_closed (GDBusConnection *connection,
 }
 
 static void
-finish_registration (void)
+got_proxy (GObject *source,
+           GAsyncResult *result,
+           gpointer data)
 {
-  gdk_content_register_serializer (G_TYPE_FILE,
-                                   "application/vnd.portal.filetransfer",
-                                   portal_file_serializer,
-                                   NULL,
-                                   NULL);
+  GError *error = NULL;
 
-  gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
-                                   "application/vnd.portal.filetransfer",
-                                   portal_file_serializer,
-                                   NULL,
-                                   NULL);
+  file_transfer_proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
+  if (!file_transfer_proxy)
+    {
+      g_message ("Failed to get file transfer portal: %s", error->message);
+      g_clear_error (&error);
+      return;
+    }
 
-  gdk_content_register_deserializer ("application/vnd.portal.filetransfer",
-                                     GDK_TYPE_FILE_LIST,
-                                     portal_file_deserializer,
-                                     NULL,
-                                     NULL);
-
-  gdk_content_register_deserializer ("application/vnd.portal.filetransfer",
-                                     G_TYPE_FILE,
-                                     portal_file_deserializer,
-                                     NULL,
-                                     NULL);
-
-  /* FIXME: I missed up and used the wrong mime type here when
-   * I implemented my own protocol. Keep these around for a while
-   * so we can interoperate with existing flatpaks using GTK 4.6
-   */
   gdk_content_register_serializer (G_TYPE_FILE,
                                    "application/vnd.portal.files",
                                    portal_file_serializer,
@@ -540,21 +523,6 @@ finish_registration (void)
                     "closed", G_CALLBACK (connection_closed), NULL);
 }
 
-static gboolean
-proxy_has_owner (GDBusProxy *proxy)
-{
-  char *owner;
-
-  owner = g_dbus_proxy_get_name_owner (proxy);
-  if (owner)
-    {
-      g_free (owner);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 void
 file_transfer_portal_register (void)
 {
@@ -563,8 +531,7 @@ file_transfer_portal_register (void)
   if (!called)
     {
       called = TRUE;
-
-      file_transfer_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+      g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                                 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
                                 | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS
                                 | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
@@ -573,13 +540,8 @@ file_transfer_portal_register (void)
                                 "/org/freedesktop/portal/documents",
                                 "org.freedesktop.portal.FileTransfer",
                                 NULL,
+                                got_proxy,
                                 NULL);
-
-      if (file_transfer_proxy && !proxy_has_owner (file_transfer_proxy))
-        g_clear_object (&file_transfer_proxy);
-
-      if (file_transfer_proxy)
-        finish_registration ();
     }
 }
 

gdk/gdk-autocleanup.h

@@ -0,0 +1,45 @@
+/* GTK - The GIMP Toolkit
+ * 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/>.
+ */
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#ifndef __GI_SCANNER__
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkAppLaunchContext, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkClipboard, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentProvider, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkCursor, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDevice, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplayManager, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrag, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrawContext, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSeat, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkPopupLayout, gdk_popup_layout_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkVulkanContext, g_object_unref)
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentFormats, gdk_content_formats_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameTimings, gdk_frame_timings_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkRGBA, gdk_rgba_free)
+
+#endif

gdk/gdk-private.h

@@ -59,8 +59,4 @@ void gdk_source_set_static_name_by_id (guint       tag,
 #define g_source_set_static_name(source, name) g_source_set_name ((source), (name))
 #endif
 
-#ifndef I_
-#define I_(string) g_intern_static_string (string)
-#endif
-
 #endif /* __GDK__PRIVATE_H__ */

gdk/gdk.c

@@ -28,13 +28,12 @@
 
 #include "gdkresources.h"
 
-#include "gdkconstructorprivate.h"
-#include "gdkdebugprivate.h"
+#include "gdkconstructor.h"
+#include "gdkdebug.h"
 #include "gdkdisplay.h"
 #include "gdkglcontextprivate.h"
-#include <glib/gi18n-lib.h>
-#include "gdkprivate.h"
-#include <glib/gprintf.h>
+#include "gdkintl.h"
+#include "gdk-private.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -117,17 +116,18 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "vulkan",          GDK_DEBUG_VULKAN, "Information about Vulkan" },
   { "selection",       GDK_DEBUG_SELECTION, "Information about selections" },
   { "clipboard",       GDK_DEBUG_CLIPBOARD, "Information about clipboards" },
-  { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)", TRUE },
-  { "portals",         GDK_DEBUG_PORTALS, "Force the use of portals", TRUE },
-  { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support", TRUE },
-  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL", TRUE },
-  { "gl-legacy",       GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context", TRUE },
-  { "gl-gles",         GDK_DEBUG_GL_GLES, "Only allow OpenGL GLES API", TRUE },
-  { "gl-egl",          GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows", TRUE },
-  { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11", TRUE },
-  { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows", TRUE },
-  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support", TRUE },
-  { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer", TRUE },
+  { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)" },
+  { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
+  { "gl-software",     GDK_DEBUG_GL_SOFTWARE, "Force OpenGL software rendering" },
+  { "gl-texture-rect", GDK_DEBUG_GL_TEXTURE_RECT, "Use OpenGL texture rectangle extension" },
+  { "gl-legacy",       GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context" },
+  { "gl-gles",         GDK_DEBUG_GL_GLES, "Only allow OpenGL GLES API" },
+  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
+  { "gl-egl",          GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows" },
+  { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11" },
+  { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows" },
+  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" },
+  { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer" },
   { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE },
   { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible", TRUE },
 };
@@ -257,12 +257,16 @@ gdk_parse_debug_var (const char        *variable,
 
       fprintf (stderr, "Supported %s values:\n", variable);
       for (i = 0; i < nkeys; i++) {
-        if (debug_enabled || keys[i].always_enabled)
-          fprintf (stderr, "  %s%*s%s\n", keys[i].key, (int)(max_width - strlen (keys[i].key)), " ", keys[i].help);
+        fprintf (stderr, "  %s%*s%s", keys[i].key, (int)(max_width - strlen (keys[i].key)), " ", keys[i].help);
+        if (!debug_enabled && !keys[i].always_enabled)
+          fprintf (stderr, " [unavailable]");
+        fprintf (stderr, "\n");
       }
       fprintf (stderr, "  %s%*s%s\n", "all", max_width - 3, " ", "Enable all values");
       fprintf (stderr, "  %s%*s%s\n", "help", max_width - 4, " ", "Print this help");
       fprintf (stderr, "\nMultiple values can be given, separated by : or space.\n");
+      if (!debug_enabled)
+        fprintf (stderr, "Values marked as [unavailable] are only accessible if GTK is built with G_ENABLE_DEBUG.\n");
     }
 
   if (invert)
@@ -293,11 +297,11 @@ gdk_pre_parse (void)
                                           G_N_ELEMENTS (gdk_debug_keys));
 
   /* These are global */
-  if (_gdk_debug_flags & GDK_DEBUG_GL_EGL)
+  if (GDK_DEBUG_CHECK (GL_EGL))
     gdk_gl_backend_use (GDK_GL_EGL);
-  else if (_gdk_debug_flags & GDK_DEBUG_GL_GLX)
+  else if (GDK_DEBUG_CHECK (GL_GLX))
     gdk_gl_backend_use (GDK_GL_GLX);
-  else if (_gdk_debug_flags & GDK_DEBUG_GL_WGL)
+  else if (GDK_DEBUG_CHECK (GL_WGL))
     gdk_gl_backend_use (GDK_GL_WGL);
 
 #ifndef G_HAS_CONSTRUCTORS
@@ -356,13 +360,21 @@ gdk_running_in_sandbox (void)
 gboolean
 gdk_should_use_portal (void)
 {
-  if (gdk_display_get_debug_flags (NULL) & GDK_DEBUG_PORTALS)
-    return TRUE;
+  static const char *use_portal = NULL;
 
-  if (gdk_running_in_sandbox ())
-    return TRUE;
+  if (G_UNLIKELY (use_portal == NULL))
+    {
+      if (gdk_running_in_sandbox ())
+        use_portal = "1";
+      else
+        {
+          use_portal = g_getenv ("GTK_USE_PORTAL");
+          if (!use_portal)
+            use_portal = "";
+        }
+    }
 
-  return FALSE;
+  return use_portal[0] == '1';
 }
 
 PangoDirection

gdk/gdk.h

@@ -76,6 +76,8 @@
 #include <gdk/gdkversionmacros.h>
 #include <gdk/gdkvulkancontext.h>
 
+#include <gdk/gdk-autocleanup.h>
+
 #undef __GDK_H_INSIDE__
 
 #endif /* __GDK_H__ */

gdk/gdkapplaunchcontext.c

@@ -22,7 +22,7 @@
 
 #include "gdkapplaunchcontextprivate.h"
 #include "gdkdisplay.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 
 
 /**

gdk/gdkapplaunchcontext.h

@@ -54,7 +54,6 @@ GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
                                                            const char          *icon_name);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkAppLaunchContext, g_object_unref)
 
 G_END_DECLS
 

gdk/gdkclipboard.c

@@ -26,10 +26,9 @@
 #include "gdkcontentproviderprivate.h"
 #include "gdkcontentserializer.h"
 #include "gdkdisplay.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 #include "gdkpipeiostreamprivate.h"
 #include "gdktexture.h"
-#include "gdkprivate.h"
 
 #include <gobject/gvaluecollector.h>
 
@@ -409,7 +408,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
    * Emitted when the clipboard changes ownership.
    */
   signals[CHANGED] =
-    g_signal_new (I_("changed"),
+    g_signal_new ("changed",
                   G_TYPE_FROM_CLASS (class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkClipboardClass, changed),

gdk/gdkclipboard.h

@@ -120,8 +120,6 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_clipboard_set_texture       (GdkClipboard          *clipboard,
                                                          GdkTexture            *texture);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkClipboard, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_CLIPBOARD_H__ */

gdk/gdkcontentdeserializer.c

@@ -25,7 +25,6 @@
 #include "filetransferportalprivate.h"
 #include "gdktexture.h"
 #include "gdkrgbaprivate.h"
-#include "gdkprivate.h"
 #include "loaders/gdkpngprivate.h"
 #include "loaders/gdktiffprivate.h"
 
@@ -355,14 +354,12 @@ gdk_content_deserializer_return_success (GdkContentDeserializer *deserializer)
 {
   g_return_if_fail (GDK_IS_CONTENT_DESERIALIZER (deserializer));
   g_return_if_fail (!deserializer->returned);
-  guint source_id;
 
   deserializer->returned = TRUE;
-  source_id = g_idle_add_full (deserializer->priority,
-                               gdk_content_deserializer_emit_callback,
-                               deserializer,
-                               g_object_unref);
-  gdk_source_set_static_name_by_id (source_id, "[gtk] gdk_content_deserializer_emit_callback");
+  g_idle_add_full (deserializer->priority,
+                   gdk_content_deserializer_emit_callback,
+                   deserializer,
+                   g_object_unref);
   /* NB: the idle will destroy our reference */
 }
 
@@ -410,6 +407,8 @@ gdk_content_register_deserializer (const char                *mime_type,
   g_return_if_fail (mime_type != NULL);
   g_return_if_fail (deserialize != NULL);
 
+  init ();
+
   deserializer = g_slice_new0 (Deserializer);
 
   deserializer->mime_type = g_intern_string (mime_type);

gdk/gdkcontentformats.c

@@ -184,7 +184,7 @@ gdk_content_formats_new_for_gtype (GType type)
  * @string: the string to parse
  *
  * Parses the given @string into `GdkContentFormats` and
- * returns the formats.
+ * returns the formats. 
  *
  * Strings printed via [method@Gdk.ContentFormats.to_string]
  * can be read in again successfully using this function.
@@ -540,7 +540,7 @@ gdk_content_formats_get_gtypes (const GdkContentFormats *formats,
 
   if (n_gtypes)
     *n_gtypes = formats->n_gtypes;
-
+  
   return formats->gtypes;
 }
 
@@ -567,7 +567,7 @@ gdk_content_formats_get_mime_types (const GdkContentFormats *formats,
 
   if (n_mime_types)
     *n_mime_types = formats->n_mime_types;
-
+  
   return formats->mime_types;
 }
 
@@ -663,7 +663,7 @@ gdk_content_formats_builder_unref (GdkContentFormatsBuilder *builder)
 
   if (builder->ref_count > 0)
     return;
-
+  
   gdk_content_formats_builder_clear (builder);
   g_slice_free (GdkContentFormatsBuilder, builder);
 }
@@ -862,50 +862,4 @@ gdk_file_list_get_files (GdkFileList *file_list)
   return g_slist_copy ((GSList *) file_list);
 }
 
-/**
- * gdk_file_list_new_from_list:
- * @files: (element-type GFile): a list of files
- *
- * Creates a new files list container from a singly linked list of
- * `GFile` instances.
- *
- * This function is meant to be used by language bindings
- *
- * Returns: (transfer full): the newly created files list
- *
- * Since: 4.8
- */
-GdkFileList *
-gdk_file_list_new_from_list (GSList *files)
-{
-  return gdk_file_list_copy (files);
-}
-
-/**
- * gdk_file_list_new_from_array:
- * @files: (array length=n_files): the files to add to the list
- * @n_files: the number of files in the array
- *
- * Creates a new `GdkFileList` for the given array of files.
- *
- * This function is meant to be used by language bindings.
- *
- * Returns: (transfer full): the newly create files list
- *
- * Since: 4.8
- */
-GdkFileList *
-gdk_file_list_new_from_array (GFile **files,
-                              gsize   n_files)
-{
-  if (files == NULL || n_files == 0)
-    return NULL;
-
-  GSList *res = NULL;
-  for (gssize i = n_files - 1; i >= 0; i--)
-    res = g_slist_prepend (res, g_object_ref (files[i]));
-
-  return (GdkFileList *) res;
-}
-
 /* }}} */

gdk/gdkcontentformats.h

@@ -106,8 +106,6 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_content_formats_builder_add_gtype   (GdkContentFormatsBuilder       *builder,
                                                                  GType                           type);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentFormats, gdk_content_formats_unref)
-
 /* dunno where else to put this */
 #define GDK_TYPE_FILE_LIST (gdk_file_list_get_type ())
 GDK_AVAILABLE_IN_ALL
@@ -124,11 +122,6 @@ typedef struct _GdkFileList GdkFileList;
 
 GDK_AVAILABLE_IN_4_6
 GSList *        gdk_file_list_get_files (GdkFileList *file_list);
-GDK_AVAILABLE_IN_4_8
-GdkFileList *   gdk_file_list_new_from_list (GSList *files);
-GDK_AVAILABLE_IN_4_8
-GdkFileList *   gdk_file_list_new_from_array (GFile **files,
-                                              gsize   n_files);
 
 G_END_DECLS
 

gdk/gdkcontentprovider.c

@@ -22,8 +22,7 @@
 
 #include "gdkclipboard.h"
 #include "gdkcontentformats.h"
-#include <glib/gi18n-lib.h>
-#include "gdkprivate.h"
+#include "gdkintl.h"
 
 /**
  * GdkContentProvider:
@@ -198,7 +197,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
    * Emitted whenever the content provided by this provider has changed.
    */
   signals[CONTENT_CHANGED] =
-    g_signal_new (I_("content-changed"),
+    g_signal_new ("content-changed",
                   G_TYPE_FROM_CLASS (class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkContentProviderClass, content_changed),

gdk/gdkcontentprovider.h

@@ -111,9 +111,6 @@ GDK_AVAILABLE_IN_ALL
 gboolean                gdk_content_provider_get_value                  (GdkContentProvider     *provider,
                                                                          GValue                 *value,
                                                                          GError                **error);
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentProvider, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_CONTENT_PROVIDER_H__ */

gdk/gdkcontentproviderimpl.c

@@ -24,10 +24,10 @@
 
 #include "gdkcontentformats.h"
 #include "gdkcontentserializer.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 #include "gdkcontentproviderimpl.h"
 
-#include "gdkprivate.h"
+#include "gdk-private.h"
 
 #define GDK_TYPE_CONTENT_PROVIDER_VALUE            (gdk_content_provider_value_get_type ())
 #define GDK_CONTENT_PROVIDER_VALUE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_CONTENT_PROVIDER_VALUE, GdkContentProviderValue))

gdk/gdkcontentserializer.c

@@ -30,7 +30,6 @@
 #include "loaders/gdktiffprivate.h"
 #include "loaders/gdkjpegprivate.h"
 #include "gdkmemorytextureprivate.h"
-#include "gdkprivate.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <string.h>
@@ -361,14 +360,12 @@ gdk_content_serializer_return_success (GdkContentSerializer *serializer)
 {
   g_return_if_fail (GDK_IS_CONTENT_SERIALIZER (serializer));
   g_return_if_fail (!serializer->returned);
-  guint source_id;
 
   serializer->returned = TRUE;
-  source_id = g_idle_add_full (serializer->priority,
-                               gdk_content_serializer_emit_callback,
-                               serializer,
-                               g_object_unref);
-  gdk_source_set_static_name_by_id (source_id, "[gtk] gdk_content_serializer_emit_callback");
+  g_idle_add_full (serializer->priority,
+                   gdk_content_serializer_emit_callback,
+                   serializer,
+                   g_object_unref);
   /* NB: the idle will destroy our reference */
 }
 
@@ -416,6 +413,8 @@ gdk_content_register_serializer (GType                    type,
   g_return_if_fail (mime_type != NULL);
   g_return_if_fail (serialize != NULL);
 
+  init ();
+
   serializer = g_slice_new0 (Serializer);
 
   serializer->mime_type = g_intern_string (mime_type);

gdk/gdkcursor.c

@@ -30,7 +30,7 @@
 #include "gdkcursor.h"
 #include "gdkcursorprivate.h"
 #include "gdktexture.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 
 #include <math.h>
 #include <errno.h>

gdk/gdkcursor.h

@@ -64,7 +64,6 @@ int         gdk_cursor_get_hotspot_x     (GdkCursor       *cursor);
 GDK_AVAILABLE_IN_ALL
 int         gdk_cursor_get_hotspot_y     (GdkCursor       *cursor);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkCursor, g_object_unref)
 
 G_END_DECLS
 

gdk/gdkdebug.h

@@ -21,7 +21,6 @@
 #include <glib.h>
 
 #include "gdktypes.h"
-#include <glib/gstdio.h>
 
 G_BEGIN_DECLS
 
@@ -39,18 +38,19 @@ typedef enum {
   GDK_DEBUG_CLIPBOARD       = 1 << 10,
   /* flags below are influencing behavior */
   GDK_DEBUG_NOGRABS         = 1 << 11,
-  GDK_DEBUG_PORTALS         = 1 << 12,
-  GDK_DEBUG_GL_DISABLE      = 1 << 13,
-  GDK_DEBUG_GL_LEGACY       = 1 << 16,
-  GDK_DEBUG_GL_GLES         = 1 << 17,
-  GDK_DEBUG_GL_DEBUG        = 1 << 18,
-  GDK_DEBUG_GL_EGL          = 1 << 19,
-  GDK_DEBUG_GL_GLX          = 1 << 20,
-  GDK_DEBUG_GL_WGL          = 1 << 21,
-  GDK_DEBUG_VULKAN_DISABLE  = 1 << 22,
-  GDK_DEBUG_VULKAN_VALIDATE = 1 << 23,
-  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 24,
-  GDK_DEBUG_HIGH_DEPTH      = 1 << 25,
+  GDK_DEBUG_GL_DISABLE      = 1 << 12,
+  GDK_DEBUG_GL_SOFTWARE     = 1 << 13,
+  GDK_DEBUG_GL_TEXTURE_RECT = 1 << 14,
+  GDK_DEBUG_GL_LEGACY       = 1 << 15,
+  GDK_DEBUG_GL_GLES         = 1 << 16,
+  GDK_DEBUG_GL_DEBUG        = 1 << 17,
+  GDK_DEBUG_GL_EGL          = 1 << 18,
+  GDK_DEBUG_GL_GLX          = 1 << 19,
+  GDK_DEBUG_GL_WGL          = 1 << 20,
+  GDK_DEBUG_VULKAN_DISABLE  = 1 << 21,
+  GDK_DEBUG_VULKAN_VALIDATE = 1 << 22,
+  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 23,
+  GDK_DEBUG_HIGH_DEPTH      = 1 << 24,
 } GdkDebugFlags;
 
 extern guint _gdk_debug_flags;
@@ -59,27 +59,22 @@ GdkDebugFlags    gdk_display_get_debug_flags    (GdkDisplay       *display);
 void             gdk_display_set_debug_flags    (GdkDisplay       *display,
                                                  GdkDebugFlags     flags);
 
-#define gdk_debug_message(format, ...) g_fprintf (stderr, format "\n", ##__VA_ARGS__)
-
 #ifdef G_ENABLE_DEBUG
 
 #define GDK_DISPLAY_DEBUG_CHECK(display,type) \
     G_UNLIKELY (gdk_display_get_debug_flags (display) & GDK_DEBUG_##type)
-
-#define GDK_DISPLAY_DEBUG(display,type,...)                               \
-    G_STMT_START {                                                        \
+#define GDK_DISPLAY_NOTE(display,type,action)          G_STMT_START {     \
     if (GDK_DISPLAY_DEBUG_CHECK (display,type))                           \
-      gdk_debug_message (__VA_ARGS__);                                    \
-    } G_STMT_END
+       { action; };                            } G_STMT_END
 
 #else /* !G_ENABLE_DEBUG */
 
 #define GDK_DISPLAY_DEBUG_CHECK(display,type) 0
-#define GDK_DISPLAY_DEBUG(display,type,...)
+#define GDK_DISPLAY_NOTE(display,type,action)
 
 #endif /* G_ENABLE_DEBUG */
 
 #define GDK_DEBUG_CHECK(type) GDK_DISPLAY_DEBUG_CHECK (NULL,type)
-#define GDK_DEBUG(type,...) GDK_DISPLAY_DEBUG (NULL,type,__VA_ARGS__)
+#define GDK_NOTE(type,action) GDK_DISPLAY_NOTE (NULL,type,action)
 
 #endif

gdk/gdkdevice.c

@@ -22,7 +22,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetool.h"
 #include "gdkdisplayprivate.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 #include "gdkkeysprivate.h"
 
 /**

gdk/gdkdevice.h

@@ -126,9 +126,6 @@ GdkSurface *        gdk_device_get_surface_at_position  (GdkDevice *device,
 
 GDK_AVAILABLE_IN_4_2
 guint32             gdk_device_get_timestamp            (GdkDevice *device);
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDevice, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_H__ */

gdk/gdkdevicetool.c

@@ -21,7 +21,7 @@
 
 #include "gdkdevicetoolprivate.h"
 #include "gdkenumtypes.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 
 /**
  * GdkDeviceTool:

gdk/gdkdisplay.c

@@ -24,8 +24,8 @@
 #include "gdkdisplay.h"
 #include "gdkdisplayprivate.h"
 
-#include <glib/gi18n-lib.h>
-#include "gdkprivate.h"
+#include "gdkintl.h"
+#include "gdk-private.h"
 
 #include "gdkapplaunchcontext.h"
 #include "gdkclipboardprivate.h"
@@ -1233,7 +1233,7 @@ gdk_display_init_gl (GdkDisplay *self)
 
   before = GDK_PROFILER_CURRENT_TIME;
 
-  if (gdk_display_get_debug_flags (self) & GDK_DEBUG_GL_DISABLE)
+  if (GDK_DISPLAY_DEBUG_CHECK (self, GL_DISABLE))
     {
       g_set_error_literal (&priv->gl_error, GDK_GL_ERROR,
                            GDK_GL_ERROR_NOT_AVAILABLE,
@@ -1729,31 +1729,28 @@ gdk_display_init_egl (GdkDisplay  *self,
   if (priv->egl_config_high_depth == NULL)
     priv->egl_config_high_depth = priv->egl_config;
 
-#ifdef G_ENABLE_DEBUG
-  if (GDK_DISPLAY_DEBUG_CHECK (self, OPENGL))
-    {
+  GDK_DISPLAY_NOTE (self, OPENGL, {
       char *ext = describe_extensions (priv->egl_display);
       char *std_cfg = describe_egl_config (priv->egl_display, priv->egl_config);
       char *hd_cfg = describe_egl_config (priv->egl_display, priv->egl_config_high_depth);
-      gdk_debug_message ("EGL API version %d.%d found\n"
-                         " - Vendor: %s\n"
-                         " - Version: %s\n"
-                         " - Client APIs: %s\n"
-                         " - Extensions:\n"
-                         "\t%s\n"
-                         " - Selected fbconfig: %s\n"
-                         "          high depth: %s",
-                         major, minor,
-                         eglQueryString (priv->egl_display, EGL_VENDOR),
-                         eglQueryString (priv->egl_display, EGL_VERSION),
-                         eglQueryString (priv->egl_display, EGL_CLIENT_APIS),
-                         ext, std_cfg,
-                         priv->egl_config_high_depth == priv->egl_config ? "none" : hd_cfg);
+      g_message ("EGL API version %d.%d found\n"
+                 " - Vendor: %s\n"
+                 " - Version: %s\n"
+                 " - Client APIs: %s\n"
+                 " - Extensions:\n"
+                 "\t%s\n"
+                 " - Selected fbconfig: %s\n"
+                 "          high depth: %s",
+                 major, minor,
+                 eglQueryString (priv->egl_display, EGL_VENDOR),
+                 eglQueryString (priv->egl_display, EGL_VERSION),
+                 eglQueryString (priv->egl_display, EGL_CLIENT_APIS),
+                 ext, std_cfg,
+                 priv->egl_config_high_depth == priv->egl_config ? "none" : hd_cfg);
       g_free (hd_cfg);
       g_free (std_cfg);
       g_free (ext);
-    }
-#endif
+  });
 
   gdk_profiler_end_mark (start_time, "init EGL", NULL);
 

gdk/gdkdisplay.h

@@ -136,7 +136,7 @@ gboolean     gdk_display_get_setting (GdkDisplay *display,
                                       const char *name,
                                       GValue     *value);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref)
+
 
 G_END_DECLS
 

gdk/gdkdisplaymanager.c

@@ -28,7 +28,7 @@
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkkeysprivate.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -420,7 +420,7 @@ gdk_display_manager_open_display (GdkDisplayManager *manager,
               (any && strstr (allowed_backends, gdk_backends[j].name)) ||
               g_str_equal (backend, gdk_backends[j].name))
             {
-              GDK_DEBUG (MISC, "Trying %s backend", gdk_backends[j].name);
+              GDK_NOTE (MISC, g_message ("Trying %s backend", gdk_backends[j].name));
               display = gdk_backends[j].open_display (name);
               if (display)
                 break;

gdk/gdkdisplaymanager.h

@@ -34,6 +34,7 @@
 
 G_BEGIN_DECLS
 
+
 #define GDK_TYPE_DISPLAY_MANAGER              (gdk_display_manager_get_type ())
 #define GDK_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManager))
 #define GDK_IS_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER))
@@ -57,7 +58,6 @@ GdkDisplay *       gdk_display_manager_open_display        (GdkDisplayManager *m
 GDK_AVAILABLE_IN_ALL
 void               gdk_set_allowed_backends                (const char        *backends);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplayManager, g_object_unref)
 
 G_END_DECLS
 

gdk/gdkdisplayprivate.h

@@ -22,7 +22,7 @@
 #include "gdksurface.h"
 #include "gdkcursor.h"
 #include "gdkmonitor.h"
-#include "gdkdebugprivate.h"
+#include "gdkdebug.h"
 #include "gdksurfaceprivate.h"
 #include "gdkkeysprivate.h"
 #include "gdkdeviceprivate.h"

gdk/gdkdrag.c

@@ -42,7 +42,7 @@
 #include "gdkdragprivate.h"
 #include "gdkdisplay.h"
 #include "gdksurface.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 #include "gdkcontentformats.h"
 #include "gdkcontentprovider.h"
 #include "gdkcontentserializer.h"

gdk/gdkdrag.h

@@ -99,8 +99,6 @@ GdkContentProvider *
 GDK_AVAILABLE_IN_ALL
 GdkSurface *    gdk_drag_get_surface (GdkDrag *drag);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrag, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_DND_H__ */

gdk/gdkdragsurface.c

@@ -19,9 +19,9 @@
 
 #include "config.h"
 
-#include "gdkprivate.h"
+#include "gdk-private.h"
 #include "gdkdragsurfaceprivate.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 
 /**
  * GdkDragSurface:

gdk/gdkdrawcontext.c

@@ -22,8 +22,8 @@
 
 #include "gdkdrawcontextprivate.h"
 
-#include "gdkdebugprivate.h"
-#include <glib/gi18n-lib.h>
+#include "gdkdebug.h"
+#include "gdkintl.h"
 #include "gdkprofilerprivate.h"
 #include "gdksurfaceprivate.h"
 
@@ -364,7 +364,7 @@ gdk_draw_context_begin_frame_full (GdkDrawContext       *context,
       return;
     }
 
-  if (gdk_display_get_debug_flags (priv->display) & GDK_DEBUG_HIGH_DEPTH)
+  if (GDK_DISPLAY_DEBUG_CHECK (priv->display, HIGH_DEPTH))
     prefers_high_depth = TRUE;
 
   priv->frame_region = cairo_region_copy (region);

gdk/gdkdrawcontext.h

@@ -52,8 +52,6 @@ gboolean                gdk_draw_context_is_in_frame            (GdkDrawContext
 GDK_AVAILABLE_IN_ALL
 const cairo_region_t *  gdk_draw_context_get_frame_region       (GdkDrawContext         *context);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrawContext, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_DRAW_CONTEXT__ */

gdk/gdkdrop.c

@@ -49,7 +49,7 @@
 #include "gdkdragprivate.h"
 #include "gdkenumtypes.h"
 #include "gdkeventsprivate.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 #include "gdkpipeiostreamprivate.h"
 #include "gdksurface.h"
 

gdk/gdkdrop.h

@@ -31,6 +31,8 @@
 
 G_BEGIN_DECLS
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrop, g_object_unref)
+
 #define GDK_TYPE_DROP              (gdk_drop_get_type ())
 #define GDK_DROP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DROP, GdkDrop))
 #define GDK_IS_DROP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DROP))
@@ -83,8 +85,6 @@ const GValue *          gdk_drop_read_value_finish      (GdkDrop
                                                          GAsyncResult           *result,
                                                          GError                **error);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrop, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_DROP_H__ */

gdk/gdkenumtypes.c.template

@@ -0,0 +1,41 @@
+/*** BEGIN file-header ***/
+#include "config.h"
+#include "gdk.h"
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@basename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void)
+{
+  static gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+
+/*** END value-tail ***/
+
+/*** BEGIN file-tail ***/
+ /**/
+/*** END file-tail ***/

gdk/gdkenumtypes.h.template

@@ -0,0 +1,29 @@
+/*** BEGIN file-header ***/
+#ifndef __GDK_ENUM_TYPES_H__
+#define __GDK_ENUM_TYPES_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <glib-object.h>
+#include <gdk/gdkversionmacros.h>
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+
+/* enumerations from "@basename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GDK_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* __GDK_ENUM_TYPES_H__ */
+/*** END file-tail ***/

gdk/gdkevents.c

@@ -28,10 +28,10 @@
 #include "gdkdragprivate.h"
 #include "gdkdropprivate.h"
 #include "gdkeventsprivate.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"
-#include "gdkprivate.h"
+#include "gdk-private.h"
 
 #include <gobject/gvaluecollector.h>
 
@@ -402,15 +402,12 @@ gdk_event_alloc (GdkEventType event_type,
 
   GdkEvent *event = (GdkEvent *) g_type_create_instance (gdk_event_types[event_type]);
 
-#ifdef G_ENABLE_DEBUG
-  if (GDK_DEBUG_CHECK (EVENTS))
-    {
-      char *str = g_enum_to_string (GDK_TYPE_EVENT_TYPE, event_type);
-      gdk_debug_message ("Allocating a new %s for event type %s",
-                         g_type_name (gdk_event_types[event_type]), str);
-      g_free (str);
-    }
-#endif
+  GDK_NOTE (EVENTS, {
+            char *str = g_enum_to_string (GDK_TYPE_EVENT_TYPE, event_type);
+            g_message ("Allocating a new %s for event type %s",
+                       g_type_name (gdk_event_types[event_type]), str);
+            g_free (str);
+            });
 
   event->event_type = event_type;
   event->surface = surface != NULL ? g_object_ref (surface) : NULL;
@@ -1776,7 +1773,7 @@ gdk_key_event_matches (GdkEvent        *event,
   guint ev_keyval;
   int layout;
   int level;
-  GdkModifierType ignored_modifiers;
+  GdkModifierType consumed_modifiers;
   GdkModifierType shift_group_mask;
   gboolean group_mod_is_accel_mod = FALSE;
   const GdkModifierType mask = GDK_CONTROL_MASK |
@@ -1795,23 +1792,7 @@ gdk_key_event_matches (GdkEvent        *event,
   ev_keyval = self->translated[1].keyval;
   layout = self->translated[1].layout;
   level = self->translated[1].level;
-
-  /*
-   * If a modifier is currently active (e.g. Shift is pressed) and was marked
-   * as consumed, we ignore it for the purposes of matching shortcuts.
-   * For example, when Ctrl+Shift+[plus/equals key] is translated into
-   * Ctrl+plus on a keyboard where Shift+equals is the plus sign, we want
-   * shortcuts for either <Control><Shift>plus or <Control>plus to match.
-   * (See https://bugzilla.gnome.org/show_bug.cgi?id=100439)
-   *
-   * If a modifier is *not* currently active, the X11 backend can sometimes
-   * mark it as consumed where the Wayland and Windows backends do not.
-   * In this case, we still want to pay attention to its state.
-   * For example, when Ctrl+x is translated into Ctrl+x, we only want to
-   * trigger shortcuts for <Control>x, not for <Control><Shift>x.
-   * (See https://gitlab.gnome.org/GNOME/gtk/-/issues/5095)
-   */
-  ignored_modifiers = (self->translated[1].consumed & state);
+  consumed_modifiers = self->translated[1].consumed;
 
   /* if the group-toggling modifier is part of the default accel mod
    * mask, and it is active, disable it for matching
@@ -1823,7 +1804,7 @@ gdk_key_event_matches (GdkEvent        *event,
   if (mask & shift_group_mask)
     group_mod_is_accel_mod = TRUE;
 
-  if ((modifiers & ~ignored_modifiers & mask) == (state & ~ignored_modifiers & mask))
+  if ((modifiers & ~consumed_modifiers & mask) == (state & ~consumed_modifiers & mask))
     {
       /* modifier match */
       GdkKeymapKey *keys;
@@ -2387,75 +2368,10 @@ gdk_scroll_event_new_discrete (GdkSurface         *surface,
                                GdkScrollDirection  direction)
 {
   GdkScrollEvent *self = gdk_event_alloc (GDK_SCROLL, surface, device, time);
-  double delta_x = 0, delta_y = 0;
-
-  switch (direction)
-    {
-    case GDK_SCROLL_UP:
-      delta_y = -1;
-      break;
-    case GDK_SCROLL_DOWN:
-      delta_y = 1;
-      break;
-    case GDK_SCROLL_LEFT:
-      delta_x = -1;
-      break;
-    case GDK_SCROLL_RIGHT:
-      delta_x = 1;
-      break;
-    case GDK_SCROLL_SMOOTH:
-    default:
-      g_assert_not_reached ();
-      break;
-    }
 
   self->tool = tool != NULL ? g_object_ref (tool) : NULL;
   self->state = state;
   self->direction = direction;
-  self->delta_x = delta_x;
-  self->delta_y = delta_y;
-  self->unit = GDK_SCROLL_UNIT_WHEEL;
-
-  return (GdkEvent *) self;
-}
-
-/*< private >
- * gtk_scroll_event_new_value120:
- * @surface: the `GdkSurface` of the event
- * @device: the `GdkDevice` of the event
- * @tool: (nullable): the tool that generated to event
- * @time: the event serial
- * @state: Flags to indicate the state of modifier keys and mouse buttons
- *   in events.
- * @direction: scroll direction.
- * @delta_x: delta on the X axis in the 120.0 scale
- * @delta_x: delta on the Y axis in the 120.0 scale
- *
- * Creates a new discrete GdkScrollEvent for high resolution mouse wheels.
- *
- * Both axes send data in fractions of 120 where each multiple of 120
- * amounts to one logical scroll event. Fractions of 120 indicate a wheel
- * movement less than one detent.
- *
- * Returns: the newly created scroll event
- */
-GdkEvent *
-gdk_scroll_event_new_value120 (GdkSurface         *surface,
-                               GdkDevice          *device,
-                               GdkDeviceTool      *tool,
-                               guint32             time,
-                               GdkModifierType     state,
-                               GdkScrollDirection  direction,
-                               double              delta_x,
-                               double              delta_y)
-{
-  GdkScrollEvent *self = gdk_event_alloc (GDK_SCROLL, surface, device, time);
-
-  self->tool = tool != NULL ? g_object_ref (tool) : NULL;
-  self->state = state;
-  self->direction = direction;
-  self->delta_x = delta_x / 120.0;
-  self->delta_y = delta_y / 120.0;
   self->unit = GDK_SCROLL_UNIT_WHEEL;
 
   return (GdkEvent *) self;
@@ -2695,7 +2611,6 @@ gdk_touchpad_event_new_pinch (GdkSurface              *surface,
 
 GdkEvent *
 gdk_touchpad_event_new_hold (GdkSurface              *surface,
-                             GdkEventSequence        *sequence,
                              GdkDevice               *device,
                              guint32                  time,
                              GdkModifierType          state,
@@ -2708,7 +2623,6 @@ gdk_touchpad_event_new_hold (GdkSurface              *surface,
 
   self->state = state;
   self->phase = phase;
-  self->sequence = sequence;
   self->x = x;
   self->y = y;
   self->n_fingers = n_fingers;

gdk/gdkevents.h

@@ -38,6 +38,7 @@
 
 G_BEGIN_DECLS
 
+
 #define GDK_TYPE_EVENT          (gdk_event_get_type ())
 #define GDK_TYPE_EVENT_SEQUENCE (gdk_event_sequence_get_type ())
 
@@ -550,9 +551,6 @@ gboolean               gdk_key_event_get_match (GdkEvent        *event,
                                                 guint           *keyval,
                                                 GdkModifierType *modifiers);
 
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, gdk_event_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_EVENTS_H__ */

gdk/gdkeventsprivate.h

@@ -495,15 +495,6 @@ GdkEvent * gdk_scroll_event_new_discrete (GdkSurface         *surface,
                                           GdkModifierType     state,
                                           GdkScrollDirection  direction);
 
-GdkEvent * gdk_scroll_event_new_value120 (GdkSurface         *surface,
-                                          GdkDevice          *device,
-                                          GdkDeviceTool      *tool,
-                                          guint32             time,
-                                          GdkModifierType     state,
-                                          GdkScrollDirection  direction,
-                                          double              delta_x,
-                                          double              delta_y);
-
 GdkEvent * gdk_touch_event_new          (GdkEventType      type,
                                          GdkEventSequence *sequence,
                                          GdkSurface       *surface,
@@ -542,7 +533,6 @@ GdkEvent * gdk_touchpad_event_new_pinch (GdkSurface              *surface,
                                          double                   angle_delta);
 
 GdkEvent * gdk_touchpad_event_new_hold  (GdkSurface              *surface,
-                                         GdkEventSequence        *sequence,
                                          GdkDevice               *device,
                                          guint32                  time,
                                          GdkModifierType          state,

gdk/gdkframeclock.h

@@ -50,7 +50,7 @@ typedef struct _GdkFrameClockClass         GdkFrameClockClass;
  * @GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS: corresponds to GdkFrameClock::flush-events. Should not be handled by applications.
  * @GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT: corresponds to GdkFrameClock::before-paint. Should not be handled by applications.
  * @GDK_FRAME_CLOCK_PHASE_UPDATE: corresponds to GdkFrameClock::update.
- * @GDK_FRAME_CLOCK_PHASE_LAYOUT: corresponds to GdkFrameClock::layout. Should not be handled by applications.
+ * @GDK_FRAME_CLOCK_PHASE_LAYOUT: corresponds to GdkFrameClock::layout. Should not be handled by applicatiosn.
  * @GDK_FRAME_CLOCK_PHASE_PAINT: corresponds to GdkFrameClock::paint.
  * @GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS: corresponds to GdkFrameClock::resume-events. Should not be handled by applications.
  * @GDK_FRAME_CLOCK_PHASE_AFTER_PAINT: corresponds to GdkFrameClock::after-paint. Should not be handled by applications.
@@ -106,8 +106,6 @@ void gdk_frame_clock_get_refresh_info (GdkFrameClock *frame_clock,
 GDK_AVAILABLE_IN_ALL
 double gdk_frame_clock_get_fps (GdkFrameClock *frame_clock);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_FRAME_CLOCK_H__ */

gdk/gdkframeclockidle.c

@@ -26,9 +26,9 @@
 
 #include "gdkframeclockidleprivate.h"
 
-#include "gdkdebugprivate.h"
+#include "gdkdebug.h"
 #include "gdkframeclockprivate.h"
-#include "gdkprivate.h"
+#include "gdk-private.h"
 #include "gdkprofilerprivate.h"
 
 #ifdef G_OS_WIN32
@@ -123,7 +123,6 @@ get_sleep_serial (void)
     {
       sleep_source = g_source_new (&sleep_source_funcs, sizeof (GSource));
 
-      g_source_set_static_name (sleep_source, "[gtk] sleep serial");
       g_source_set_priority (sleep_source, G_PRIORITY_HIGH);
       g_source_attach (sleep_source, NULL);
       g_source_unref (sleep_source);
@@ -374,9 +373,6 @@ gdk_frame_clock_flush_idle (void *data)
   else
     priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
 
-  g_clear_handle_id (&priv->paint_idle_id, g_source_remove);
-  gdk_frame_clock_paint_idle (data);
-
   return FALSE;
 }
 

gdk/gdkframetimings.h

@@ -51,8 +51,6 @@ gint64           gdk_frame_timings_get_refresh_interval  (GdkFrameTimings *timin
 GDK_AVAILABLE_IN_ALL
 gint64           gdk_frame_timings_get_predicted_presentation_time (GdkFrameTimings *timings);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameTimings, gdk_frame_timings_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_FRAME_TIMINGS_H__ */

gdk/gdkglcontext.c

@@ -76,14 +76,14 @@
 
 #include "gdkglcontextprivate.h"
 
-#include "gdkdebugprivate.h"
+#include "gdkdebug.h"
 #include "gdkdisplayprivate.h"
-#include <glib/gi18n-lib.h>
+#include "gdkintl.h"
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"
 
-#include "gdkprivate.h"
+#include "gdk-private.h"
 
 #ifdef GDK_WINDOWING_WIN32
 # include "gdk/win32/gdkwin32.h"
@@ -193,7 +193,7 @@ gdk_gl_context_dispose (GObject *gobject)
       if (eglGetCurrentContext () == priv->egl_context)
         eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 
-      GDK_DISPLAY_DEBUG (display, OPENGL, "Destroying EGL context");
+      GDK_DISPLAY_NOTE (display, OPENGL, g_message ("Destroying EGL context"));
 
       eglDestroyContext (egl_display, priv->egl_context);
       priv->egl_context = NULL;
@@ -339,13 +339,13 @@ gdk_gl_context_create_egl_context (GdkGLContext *context,
   context_attribs[i++] = EGL_NONE;
   g_assert (i < N_EGL_ATTRS);
 
-  GDK_DISPLAY_DEBUG (display, OPENGL,
-                     "Creating EGL context version %d.%d (debug:%s, forward:%s, legacy:%s, es:%s)",
-                     major, minor,
-                     debug_bit ? "yes" : "no",
-                     forward_bit ? "yes" : "no",
-                     legacy ? "yes" : "no",
-                     api == GDK_GL_API_GLES ? "yes" : "no");
+  GDK_DISPLAY_NOTE (display, OPENGL,
+                    g_message ("Creating EGL context version %d.%d (debug:%s, forward:%s, legacy:%s, es:%s)",
+                               major, minor,
+                               debug_bit ? "yes" : "no",
+                               forward_bit ? "yes" : "no",
+                               legacy ? "yes" : "no",
+                               api == GDK_GL_API_GLES ? "yes" : "no"));
 
   ctx = eglCreateContext (egl_display,
                           egl_config,
@@ -355,7 +355,7 @@ gdk_gl_context_create_egl_context (GdkGLContext *context,
   if (ctx == NULL)
       return 0;
 
-  GDK_DISPLAY_DEBUG (display, OPENGL, "Created EGL context[%p]", ctx);
+  GDK_DISPLAY_NOTE (display, OPENGL, g_message ("Created EGL context[%p]", ctx));
 
   priv->egl_context = ctx;
   gdk_gl_context_set_is_legacy (context, legacy);
@@ -395,8 +395,8 @@ gdk_gl_context_realize_egl (GdkGLContext  *context,
       return 0;
     }
 
-  prefer_legacy = (gdk_display_get_debug_flags(display) & GDK_DEBUG_GL_LEGACY) ||
-                   (share != NULL && gdk_gl_context_is_legacy (share));
+  prefer_legacy = (GDK_DISPLAY_DEBUG_CHECK (display, GL_LEGACY) ||
+                   (share != NULL && gdk_gl_context_is_legacy (share)));
 
   if (preferred_api == GDK_GL_API_GL)
     {
@@ -1265,7 +1265,7 @@ gdk_gl_context_is_api_allowed (GdkGLContext  *self,
 {
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
 
-  if (gdk_display_get_debug_flags (gdk_gl_context_get_display (self)) & GDK_DEBUG_GL_GLES)
+  if (GDK_DISPLAY_DEBUG_CHECK (gdk_gl_context_get_display (self), GL_GLES))
     {
       if (!(api & GDK_GL_API_GLES))
         {
@@ -1485,7 +1485,9 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
 {
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
   gboolean gl_debug = FALSE;
+#ifdef G_ENABLE_DEBUG
   GdkDisplay *display;
+#endif
 
   if (!gdk_gl_context_is_realized (context))
     return;
@@ -1498,10 +1500,16 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
   priv->has_debug_output = epoxy_has_gl_extension ("GL_ARB_debug_output") ||
                            epoxy_has_gl_extension ("GL_KHR_debug");
 
+#ifdef G_ENABLE_DEBUG
   display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
-  gl_debug = (gdk_display_get_debug_flags (display) & GDK_DEBUG_GL_DEBUG) != 0;
+  gl_debug = GDK_DISPLAY_DEBUG_CHECK (display, GL_DEBUG);
+#endif
 
-  if (priv->has_debug_output && gl_debug)
+  if (priv->has_debug_output
+#ifndef G_ENABLE_CONSISTENCY_CHECKS
+      && gl_debug
+#endif
+      )
     {
       gdk_gl_context_make_current (context);
       glEnable (GL_DEBUG_OUTPUT);
@@ -1533,20 +1541,20 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
   priv->has_half_float = gdk_gl_context_check_version (context, 3, 0, 3, 0) ||
                          epoxy_has_gl_extension ("OES_vertex_half_float");
 
-  GDK_DISPLAY_DEBUG (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), OPENGL,
-                     "%s version: %d.%d (%s)\n"
-                     "* GLSL version: %s\n"
-                     "* Extensions checked:\n"
-                     " - GL_KHR_debug: %s\n"
-                     " - GL_EXT_unpack_subimage: %s\n"
-                     " - OES_vertex_half_float: %s",
-                     gdk_gl_context_get_use_es (context) ? "OpenGL ES" : "OpenGL",
-                     priv->gl_version / 10, priv->gl_version % 10,
-                     priv->is_legacy ? "legacy" : "core",
-                     glGetString (GL_SHADING_LANGUAGE_VERSION),
-                     priv->has_khr_debug ? "yes" : "no",
-                     priv->has_unpack_subimage ? "yes" : "no",
-                     priv->has_half_float ? "yes" : "no");
+  GDK_DISPLAY_NOTE (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), OPENGL,
+    g_message ("%s version: %d.%d (%s)\n"
+                       "* GLSL version: %s\n"
+                       "* Extensions checked:\n"
+                       " - GL_KHR_debug: %s\n"
+                       " - GL_EXT_unpack_subimage: %s\n"
+                       " - OES_vertex_half_float: %s",
+                       gdk_gl_context_get_use_es (context) ? "OpenGL ES" : "OpenGL",
+                       priv->gl_version / 10, priv->gl_version % 10,
+                       priv->is_legacy ? "legacy" : "core",
+                       glGetString (GL_SHADING_LANGUAGE_VERSION),
+                       priv->has_khr_debug ? "yes" : "no",
+                       priv->has_unpack_subimage ? "yes" : "no",
+                       priv->has_half_float ? "yes" : "no"));
 
   priv->extensions_checked = TRUE;
 }
@@ -1836,8 +1844,8 @@ gdk_gl_backend_use (GdkGLBackend backend_type)
       the_gl_backend_type = backend_type;
       /* This is important!!!11eleven
        * (But really: How do I print a message in 2 categories?) */
-      GDK_DEBUG (OPENGL, "Using OpenGL backend %s", gl_backend_names[the_gl_backend_type]);
-      GDK_DEBUG (MISC, "Using OpenGL backend %s", gl_backend_names[the_gl_backend_type]);
+      GDK_NOTE (OPENGL, g_print ("Using OpenGL backend %s\n", gl_backend_names[the_gl_backend_type]));
+      GDK_NOTE (MISC, g_message ("Using Opengl backend %s", gl_backend_names[the_gl_backend_type]));
     }
 
   g_assert (the_gl_backend_type == backend_type);

gdk/gdkglcontext.h

@@ -114,8 +114,6 @@ GdkGLContext *          gdk_gl_context_get_current              (void);
 GDK_AVAILABLE_IN_ALL
 void                    gdk_gl_context_clear_current            (void);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
-
 G_END_DECLS
 
 #endif /* __GDK_GL_CONTEXT_H__ */

gdk/gdkgltexture.h

@@ -36,6 +36,8 @@ G_BEGIN_DECLS
 typedef struct _GdkGLTexture            GdkGLTexture;
 typedef struct _GdkGLTextureClass       GdkGLTextureClass;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLTexture, g_object_unref)
+
 GDK_AVAILABLE_IN_ALL
 GType                   gdk_gl_texture_get_type                (void) G_GNUC_CONST;
 
@@ -50,7 +52,6 @@ GdkTexture *            gdk_gl_texture_new                     (GdkGLContext
 GDK_AVAILABLE_IN_ALL
 void                    gdk_gl_texture_release                 (GdkGLTexture    *self);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLTexture, g_object_unref)
 
 G_END_DECLS
 

gdk/gdkintl.h

@@ -0,0 +1,30 @@
+/* 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 __GDKINTL_H__
+#define __GDKINTL_H__
+
+#include <glib/gi18n-lib.h>
+
+#endif

gdk/gdkkeynames.c

@@ -0,0 +1,103 @@
+/* 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/. 
+ */
+
+#include "config.h"
+
+#include "gdkkeysyms.h"
+
+/* Key handling not part of the keymap */
+
+#include "keyname-table.h"
+
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define GDK_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval)
+
+static int
+gdk_keys_keyval_compare (const void *pkey, const void *pbase)
+{
+  return (*(int *) pkey) - ((gdk_key *) pbase)->keyval;
+}
+
+static char *
+_gdk_keyval_name (guint keyval)
+{
+  static char buf[100];
+  gdk_key *found;
+
+  /* Check for directly encoded 24-bit UCS characters: */
+  if ((keyval & 0xff000000) == 0x01000000)
+    {
+      g_sprintf (buf, "U+%.04X", (keyval & 0x00ffffff));
+      return buf;
+    }
+
+  found = bsearch (&keyval, gdk_keys_by_keyval,
+		   GDK_NUM_KEYS, sizeof (gdk_key),
+		   gdk_keys_keyval_compare);
+
+  if (found != NULL)
+    {
+      while ((found > gdk_keys_by_keyval) &&
+             ((found - 1)->keyval == keyval))
+        found--;
+	    
+      return (char *) (keynames + found->offset);
+    }
+  else if (keyval != 0)
+    {
+      g_sprintf (buf, "%#x", keyval);
+      return buf;
+    }
+
+  return NULL;
+}
+
+static int
+gdk_keys_name_compare (const void *pkey, const void *pbase)
+{
+  return strcmp ((const char *) pkey, 
+		 (const char *) (keynames + ((const gdk_key *) pbase)->offset));
+}
+
+static guint
+_gdk_keyval_from_name (const char *keyval_name)
+{
+  gdk_key *found;
+
+  g_return_val_if_fail (keyval_name != NULL, 0);
+
+  if (strncmp (keyval_name,"XF86", 4) == 0)
+    keyval_name += 4;
+
+  found = bsearch (keyval_name, gdk_keys_by_name,
+		   GDK_NUM_KEYS, sizeof (gdk_key),
+		   gdk_keys_name_compare);
+  if (found != NULL)
+    return found->keyval;
+  else
+    return GDK_KEY_VoidSymbol;
+}

gdk/gdkkeys.c

@@ -29,11 +29,6 @@
 #include "gdkdisplay.h"
 #include "gdkdisplaymanagerprivate.h"
 
-#include "keynamesprivate.h"
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
-
 enum {
   PROP_0,
   PROP_DISPLAY,
@@ -204,6 +199,22 @@ gdk_keymap_init (GdkKeymap *keymap)
   keymap->cache = g_hash_table_new (g_direct_hash, g_direct_equal);
 }
 
+/*< private >
+ * gdk_keymap_get_display:
+ * @keymap: a `GdkKeymap`
+ *
+ * Retrieves the `GdkDisplay` associated to the @keymap.
+ *
+ * Returns: (transfer none): a `GdkDisplay`
+ */
+GdkDisplay *
+gdk_keymap_get_display (GdkKeymap *keymap)
+{
+  g_return_val_if_fail (GDK_IS_KEYMAP (keymap), NULL);
+
+  return keymap->display;
+}
+
 /* Other key-handling stuff
  */
 
@@ -619,73 +630,7 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
 								  consumed_modifiers);
 }
 
-static int
-gdk_keys_keyval_compare (const void *pkey, const void *pbase)
-{
-  return (*(int *) pkey) - ((gdk_key *) pbase)->keyval;
-}
-
-static char *
-_gdk_keyval_name (guint keyval)
-{
-  static char buf[100];
-  gdk_key *found;
-
-  /* Check for directly encoded 24-bit UCS characters: */
-  if ((keyval & 0xff000000) == 0x01000000)
-    {
-      g_sprintf (buf, "U+%.04X", (keyval & 0x00ffffff));
-      return buf;
-    }
-
-  found = bsearch (&keyval,
-                   gdk_keys_by_keyval, G_N_ELEMENTS (gdk_keys_by_keyval),
-                   sizeof (gdk_key),
-                   gdk_keys_keyval_compare);
-
-  if (found != NULL)
-    {
-      while ((found > gdk_keys_by_keyval) &&
-             ((found - 1)->keyval == keyval))
-        found--;
-
-      return (char *) (keynames + found->offset);
-    }
-  else if (keyval != 0)
-    {
-      g_sprintf (buf, "%#x", keyval);
-      return buf;
-    }
-
-  return NULL;
-}
-
-static int
-gdk_keys_name_compare (const void *pkey, const void *pbase)
-{
-  return strcmp ((const char *) pkey,
-                 (const char *) (keynames + ((const gdk_key *) pbase)->offset));
-}
-
-static guint
-_gdk_keyval_from_name (const char *keyval_name)
-{
-  gdk_key *found;
-
-  g_return_val_if_fail (keyval_name != NULL, 0);
-
-  if (strncmp (keyval_name,"XF86", 4) == 0)
-    keyval_name += 4;
-
-  found = bsearch (keyval_name,
-                   gdk_keys_by_name, G_N_ELEMENTS (gdk_keys_by_name),
-                   sizeof (gdk_key),
-                   gdk_keys_name_compare);
-  if (found != NULL)
-    return found->keyval;
-  else
-    return GDK_KEY_VoidSymbol;
-}
+#include "gdkkeynames.c"
 
 /**
  * gdk_keyval_name:

gdk/gdkkeysprivate.h

@@ -89,6 +89,8 @@ struct _GdkKeymap
 
 GType gdk_keymap_get_type (void) G_GNUC_CONST;
 
+GdkDisplay *   gdk_keymap_get_display              (GdkKeymap           *keymap);
+
 guint          gdk_keymap_lookup_key               (GdkKeymap           *keymap,
                                                     const GdkKeymapKey  *key);
 gboolean       gdk_keymap_translate_keyboard_state (GdkKeymap           *keymap,