4.14.4

roaring: Fix some ubsan warnings

See merge request GNOME/gtk!7219

.gitlab-ci.yml

@@ -117,11 +117,10 @@ release-build:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - mkdir _install
-    - export PATH="$HOME/.local/bin:${CI_PROJECT_DIR}/_install/bin:$PATH"
-    - .gitlab-ci/install-meson-project.sh --prefix ${CI_PROJECT_DIR}/_install https://gitlab.gnome.org/jadahl/catch.git main
+    - export PATH="$HOME/.local/bin:$PATH"
     - meson subprojects download
     - meson subprojects update --reset
+    - mkdir _install
     - meson setup
             --prefix=${CI_PROJECT_DIR}/_install
             ${COMMON_MESON_FLAGS}
@@ -446,10 +445,10 @@ reference:
             --force-fallback-for=gdk-pixbuf,pango
             -Dintrospection=enabled
             -Ddocumentation=true
-            -Dman-pages=true
+            -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:documentation=true
-            -Dbuild-demos=true
+            -Dpango:gtk_doc=true
+            -Dbuild-demos=false
             -Dbuild-examples=false
             -Dbuild-tests=false
             -Dbuild-testsuite=false
@@ -461,7 +460,6 @@ reference:
     - mv _build/docs/reference/gdk/gdk4-wayland/ _reference/gdk4-wayland/
     - mv _build/docs/reference/gsk/gsk4/ _reference/gsk4/
     - mv _build/docs/reference/gtk/gtk4/ _reference/gtk4/
-    - mv _build/docs/reference/gtk/*.html _reference/gtk4/
     - mv _build/subprojects/pango/docs/Pango/ _reference/Pango/
     - mv _build/subprojects/pango/docs/PangoCairo/ _reference/PangoCairo/
     - mv _build/subprojects/pango/docs/PangoFc/ _reference/PangoFc/

.gitlab-ci/flatpak-build.sh

@@ -24,7 +24,7 @@ flatpak build ${builddir} meson \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
                 -Dbuild-demos=true \
-                -Dprofile=devel \
+                -Ddemo-profile=devel \
                 _flatpak_build
 
 flatpak build --env=CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA ${builddir} ninja -C _flatpak_build install

.gitlab-ci/install-meson-project.sh

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-set -e
-
-usage() {
-  cat <<-EOF
-	Usage: $(basename $0) [OPTION…] REPO_URL COMMIT
-
-	Check out and install a meson project
-
-	Options:
-	  -Dkey=val      Option to pass on to meson
-	  --prefix       Prefix to install to
-	  --subdir       Build subdirectory instead of whole project
-	  --prepare      Script to run before build
-
-	  -h, --help     Display this help
-
-	EOF
-}
-
-TEMP=$(getopt \
-  --name=$(basename $0) \
-  --options='D:h' \
-  --longoptions='prefix:' \
-  --longoptions='subdir:' \
-  --longoptions='prepare:' \
-  --longoptions='help' \
-  -- "$@")
-
-eval set -- "$TEMP"
-unset TEMP
-
-MESON_OPTIONS=()
-PREFIX=/usr
-SUBDIR=.
-PREPARE=:
-
-while true; do
-  case "$1" in
-    -D)
-      MESON_OPTIONS+=( -D$2 )
-      shift 2
-    ;;
-
-    --prefix)
-      PREFIX=$2
-      shift 2
-    ;;
-
-    --subdir)
-      SUBDIR=$2
-      shift 2
-    ;;
-
-    --prepare)
-      PREPARE=$2
-      shift 2
-    ;;
-
-    -h|--help)
-      usage
-      exit 0
-    ;;
-
-    --)
-      shift
-      break
-    ;;
-  esac
-done
-
-if [[ $# -lt 2 ]]; then
-  usage
-  exit 1
-fi
-
-REPO_URL="$1"
-COMMIT="$2"
-
-CHECKOUT_DIR=$(mktemp --directory)
-trap "rm -rf $CHECKOUT_DIR" EXIT
-
-git clone --depth 1 "$REPO_URL" -b "$COMMIT" "$CHECKOUT_DIR"
-
-pushd "$CHECKOUT_DIR/$SUBDIR"
-sh -c "$PREPARE"
-meson setup --prefix "$PREFIX" _build "${MESON_OPTIONS[@]}"
-meson compile -C _build
-meson install -C _build
-popd

NEWS

@@ -1,93 +1,9 @@
-Overview of Changes in 4.15.4, xx-xx-xxxx
-=========================================
-
-Overview of Changes in 4.15.3, 29-06-2024
-=========================================
-
-* Accessibility:
- - Only emit notifications when cursor positions change in GtkText
- - Fix handling of help text properties
-
-* CSS:
- - Fix some crashes introduced in recent currentcolor changes
-
-* DND:
- - Avoid a critical
-
-* Documentation:
- - Fix many oversights and missing docs
-
-* maxOS:
- - Add native keyboard shortcuts
-
-
-Overview of Changes in 4.15.2, 28-06-2024
-=========================================
-
-* GtkFileChooserWidget:
- - Plug some memory leaks
- - Make Ctrl-Shift-N create a new folder
-
-* GtkPopover:
- - Handle resizing and position changes better
-
-* CSS:
- - Support color(), oklab(), etc (https://www.w3.org/TR/css-color-4/)
- - Support color-mix() (https://www.w3.org/TR/css-color-5/)
- - Support relative colors (https://www.w3.org/TR/css-color-5/)
- - Support more colorspaces in color()
- - Allow percentages for opacity
- - Handle currentcolor more correctly
-
-* Accessibility:
- - Avoid markup when reading labels
-
-* GSK:
- - Subset fonts when serializing node trees
- - Make ngl export render_texture results as dmabufs
-
-* Wayland:
- - Use xdg-dialog protocol for attached dialogs
-
-* Windows:
- - Build with UNICODE
-
-* macOS:
- - Implement fullscreen-on-monitor
-
-* Documentation:
- - Widget shortcuts and actions are now described in the docs
-
-* Debugging:
- - Add GTK_DEBUG=css for warning about deprecated css syntax
-
-* Tools:
- - rendernode-tool: Add an extract command for data urls
-
-* Deprecations:
- - CSS Color functions shade(), lighter(), darker(), alpha(), mix()
-
-* Translation updates:
- Czech
- Hebrew
- Serbian
-
-
-Overview of Changes in 4.15.1, 21-05-2024
+Overview of Changes in 4.14.4, 02-05-2024
 =========================================
 
 * GtkGraphicsOffload:
  - Don't crash without a child
 
-* GtkSpinner:
- - Don't animate when unmapped
-
-* CSS:
- - Support the :root selector
- - Support variables and custom properties (https://www.w3.org/TR/css-variables-1/)
- - Implement math functions (https://www.w3.org/TR/css-values-4/)
- - Support modern syntax and calc in rgb() and hsl()
-
 * Icontheme:
  - Make symbolic svg loading more efficient
  - Handle color-free symbolics more efficiently
@@ -95,156 +11,59 @@ Overview of Changes in 4.15.1, 21-05-2024
 * Accessibility:
  - Make the gtk-demo sidebar search more accessible
  - Stop emitting focus events
- - Realize child contexts when necessary
 
 * GDK:
  - Support XDG_ACTIVATION_TOKEN
- - dmabuf: Be more defensive when importing unknown formats to GL
+ - dmabuf: Be more defensive when importing unknown formats to G
  - dmabuf: Use narrow range for YUV
- - vulkan: Recreate swapchains when necessary or beneficial
 
 * GSK:
- - Improve logging for GDK_DEBUG=offload
- - Improve logging for GSK_DEBUG=renderer
- - gpu: Warn about inefficient texture import
- - gpu: Handle tiny offscreens correctly
- - vulkan: Add profiler marks in various places
- - vulkan: Fix a problem with imported dmabufs showing up black
- - cairo: Speed up mask nodes, since we use them for symbolic icons
-
-* Wayland:
- - Use wl_compositor version 6
-
-* X11:
- - Implement a missing method
+ - gpu: Handle  tiny offscreens correctl
 
 * Build:
- - Fix many ubsan warnings
+ - Fix many ubsan warning
 
-* Debugging:
- - Show more texture details in the recorder
- - Use GTK_DEBUG=css to see CSS deprecations
-
-* macOS:
+* macOS
  - Fix problems with events handed back to the OS
  - Respect GDK_DEBUG=default-settings
- - Allow applictions to handle Dock > Quit
-
-* Deprecations:
- - Use of @name colors in CSS
 
 * Translation updates:
- Catalan
- Georgian
- Hungarian
+ German
+ Indonesian
+ Kabyle
  Korean
- Portuguese
- Turkish
+ Lithuanian
+ Russian
 
 
-Overview of Changes in 4.15.0, 21-04-2024
+Overview of Changes in 4.14.3, 18-04-2024
 =========================================
 
-This release changes the default GSK renderer to be Vulkan, on
-Wayland. Other platforms still use ngl.
-
-The intent of this change is to get wider testing and verify that
-Vulkan drivers are good enough for us to rely on. If significant
-problems show up, we will revert this change for 4.16.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
----
-
-This release also changes font rendering settings by introducing
-a new high-level gtk-font-rendering settings which gives GTK more
-freedom to decide on font rendering.
-
-You can still use the low-level font-related settings by changing
-the new property to 'manual'.
-
----
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
 * GtkShortcutManager:
  - Track the propagation phase of added controllers
 
-* GtkGLArea:
- - Produce dmabuf textures, so graphics offload is possible
-
-* GtkTextView:
- - Support text shadows
-
-* GtkGraphicsOffload:
- - Add a black-background property
-
-* Settings:
- - Add a new gtk-font-rendering setting
-
 * Accessibility:
- - Add support for GetRangeExtents to GtkAccessibleText
- - Add support for GetOffsetAtPoint to GtkAccessibleText
  - Implement GtkAccessibleRange for scrollbars
 
-* GDK:
- - Add a callback-based cursor API
-
-* GSK:
--  Use the Vulkan renderer by default
- - Avoid an infinite recursion with offscreens in some cases
- - Optimize graphics offload to make it more likely that compositors
-   can use direct scanout
-
 * X11:
  - Fix some confusing debug messages
  - Drop a no-longer-relevant optimization that was interfering with
    getting the current window manager capabilities
 
-* macOS:
- - Implement the color picker for macOS 10.15+
-
-* Debugging:
- - Snow monitor resolution in the inspector
-
-* Demos:
- - Use graphics offload in the shadertoy demo
- - Show more reliable fps numbers in the fishbowl demo
-
 * Tools:
  - Support generating pdf in gtk4-rendernode-tool
 
-* Build:
- - Require pango 1.52
- - Require cairo 1.18
- - Add a missing dependency that was causing build failures
- - Drop deprecated build options:
-   gtk_doc -> documentation
-   update_screenshots -> screenshots
-   demo-profile -> profile
-   demos -> build-demos
-
-* Deprecations:
- - gdk_widget_set/get_font_options
- - gdk_wayland/x11_display_set_cursor_theme
-
 * Translation updates:
  Basque
  Brazilian Portuguese
- British English
- Chinese (China)
+ Georgian
  Hebrew
  Kabyle
  Persian
  Polish
- Russian
  Slovenian
  Swedish
- Turkish
+ Ukrainian
 
 
 Overview of Changes in 4.14.2, 03-04-2024

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

@@ -186,7 +186,7 @@
             "config-opts" : [
                 "--libdir=/app/lib",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

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

@@ -115,7 +115,7 @@
             "config-opts" : [
                 "--libdir=/app/lib",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

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

@@ -115,7 +115,7 @@
             "config-opts" : [
                 "--libdir=/app/lib",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

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

@@ -115,7 +115,7 @@
             "config-opts" : [
                 "--libdir=/app/lib",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

demos/gtk-demo/cursors.c

@@ -15,54 +15,12 @@ on_destroy (gpointer data)
   window = NULL;
 }
 
-static GdkTexture *
-cursor_callback (GdkCursor *cursor,
-                 int        cursor_size,
-                 double     scale,
-                 int       *width,
-                 int       *height,
-                 int       *hotspot_x,
-                 int       *hotspot_y,
-                 gpointer   data)
-{
-  GdkPixbuf *pixbuf;
-  GdkTexture *texture;
-  GError *error = NULL;
-  int scaled_size;
-
-  scaled_size = ceil (cursor_size * scale);
-
-  pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/cursors/images/gtk-logo.svg",
-                                                  scaled_size, scaled_size,
-                                                  TRUE,
-                                                  &error);
-  if (!pixbuf)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return NULL;
-    }
-
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-
-  g_object_unref (pixbuf);
-
-  *width = cursor_size;
-  *height = cursor_size;
-  *hotspot_x = 18 * cursor_size / 32.0;
-  *hotspot_y = 2 * cursor_size / 32.0;
-
-  return texture;
-}
-
 GtkWidget *
 do_cursors (GtkWidget *do_widget)
 {
   if (!window)
     {
       GtkBuilder *builder;
-      GtkWidget *logo_callback;
-      GdkCursor *cursor;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
@@ -71,10 +29,6 @@ do_cursors (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (on_destroy), NULL);
-      logo_callback = GTK_WIDGET (gtk_builder_get_object (builder, "logo_callback"));
-      cursor = gdk_cursor_new_from_callback (cursor_callback, NULL, NULL, NULL);
-      gtk_widget_set_cursor (logo_callback, cursor);
-      g_object_unref (cursor);
       g_object_unref (builder);
     }
 

demos/gtk-demo/demo.gresource.xml

@@ -116,7 +116,6 @@
     <file>w_resize_cursor.png</file>
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
-    <file>gtk-logo.svg</file>
   </gresource>
   <gresource prefix="/dnd">
     <file>dnd.css</file>

demos/gtk-demo/fontify.c

@@ -363,9 +363,7 @@ insert_markup_idle (gpointer data)
 
       if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
         {
-          guint id;
-          id = g_idle_add (insert_markup_idle, data);
-          g_source_set_name_by_id (id, "[gtk-demo] insert_markup_idle");
+          g_idle_add (insert_markup_idle, data);
           return G_SOURCE_REMOVE;
         }
 
@@ -400,9 +398,7 @@ parse_markup_idle (gpointer data)
   do {
     if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
       {
-        guint id;
-        id = g_idle_add (parse_markup_idle, data);
-        g_source_set_name_by_id (id, "[gtk-demo] parse_markup_idle");
+        g_idle_add (parse_markup_idle, data);
         return G_SOURCE_REMOVE;
       }
 

demos/gtk-demo/gtk-logo.svg

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg6843"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   version="1.0"
-   sodipodi:docname="gtk-logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/ebassi/Pictures/gtk-logo-256.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <defs
-     id="defs6845">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-50 : 600 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="700 : 600 : 1"
-       inkscape:persp3d-origin="300 : 400 : 1"
-       id="perspective13" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="69.874353"
-     inkscape:cy="64.313526"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     width="128px"
-     height="128px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7947" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata6848">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:source />
-        <dc:relation />
-        <dc:language />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path6976"
-       d="M 20.88413,30.82696 L 53.816977,55.527708 L 107.33282,39.060543 L 70.587303,17.177763 L 20.88413,30.82696 z"
-       style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6978"
-       d="M 22.94243,82.287118 L 20.88413,30.82696 L 53.816977,55.527708 L 53.816977,111.10486 L 22.94243,82.287118 z"
-       style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6980"
-       d="M 53.816977,111.10486 L 103.21619,90.5207 L 107.33282,39.060543 L 53.816977,55.527708 L 53.816977,111.10486 z"
-       style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path6982"
-       d="M 23.216626,81.319479 L 70.48573,67.361442 L 103.38422,90.444516"
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path6984"
-       d="M 70.434539,17.875593 L 70.434539,66.984877"
-       style="opacity:1;fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>

demos/gtk-demo/language-names.c

@@ -40,7 +40,7 @@ get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
 {
   wchar_t *langname_w = NULL;
   wchar_t locale_abbrev_w[9];
-  gchar *langname, *locale_abbrev, *locale;
+  gchar *langname, *locale_abbrev, *locale, *p;
   gint i;
   const LCTYPE iso639_lctypes[] = { LOCALE_SISO639LANGNAME, LOCALE_SISO639LANGNAME2 };
   GHashTable *ht_scripts_langs = (GHashTable *) param;
@@ -59,6 +59,7 @@ get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
   GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, langname_size);
   langname = g_utf16_to_utf8 (langname_w, -1, NULL, NULL, NULL);
   locale = g_utf16_to_utf8 (locale_w, -1, NULL, NULL, NULL);
+  p = strchr (locale, '-');
   lang = pango_language_from_string (locale);
   if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
     g_hash_table_insert (ht_scripts_langs, lang, langname);

demos/gtk-demo/shadertoy.c

@@ -120,7 +120,7 @@ create_shadertoy_window (GtkWidget *do_widget)
   gtk_box_append (GTK_BOX (box), aspect);
 
   shadertoy = new_shadertoy ("/shadertoy/alienplanet.glsl");
-  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (aspect), gtk_graphics_offload_new (shadertoy));
+  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (aspect), shadertoy);
 
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 250);

demos/node-editor/node-editor-application.c

@@ -299,7 +299,7 @@ node_editor_application_new (void)
 
   app = g_object_new (NODE_EDITOR_APPLICATION_TYPE,
                       "application-id", "org.gtk.gtk4.NodeEditor",
-                      "flags", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE,
+                      "flags", G_APPLICATION_HANDLES_OPEN,
                       NULL);
 
   g_application_add_main_option (G_APPLICATION (app), "version", 0, 0,G_OPTION_ARG_NONE, "Show program version", NULL);

demos/node-editor/node-format.md

@@ -330,7 +330,6 @@ stroke bounds of the path.
 | offset       | `<point>`           | 0 0                 | non-default |
 | hint-style   | `<hint style>`      | slight              | non-default |
 | antialias    | `<antialias>`       | gray                | non-default |
-| hint-metrics | `<hint metrics>`    | off                 | non-default |
 
 Creates a node like `gsk_text_node_new()` with the given properties.
 
@@ -347,7 +346,6 @@ font, an error node will be returned.
 
 Possible values for hint-style are none, slight or full.
 Possible value for antialias are none or gray.
-Possible value for hint-metrics are on or off.
 
 ### texture
 

docs/reference/gdk/gdk4.toml.in

@@ -111,11 +111,3 @@ content_images = [
 ]
 content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gdk/"
 urlmap_file = "urlmap.js"
-
-[[object]]
-name = "DECLARE_INTERNAL_TYPE"
-hidden = true
-
-[[object]]
-pattern = "KEY_*"
-check_ignore = true

docs/reference/gdk/meson.build

@@ -29,18 +29,6 @@ if get_option('documentation')
     install_dir: docs_dir,
   )
 
-  test('doc-check-gdk',
-    gidocgen,
-    args: [
-      'check',
-      '--config', gdk4_toml,
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      gdk_gir[0],
-    ],
-    depends: gdk_gir[0],
-    suite: ['docs'],
-  )
-
   if x11_enabled
     gdk4x11_toml = configure_file(
       input: 'gdk4-x11.toml.in',
@@ -99,17 +87,5 @@ if get_option('documentation')
       install: true,
       install_dir: docs_dir,
     )
-
-    test('doc-check-gdk-wayland',
-      gidocgen,
-      args: [
-        'check',
-        '--config', gdk4wayland_toml,
-        '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-        gdk_wayland_gir[0],
-      ],
-      depends: gdk_wayland_gir[0],
-      suite: ['docs'],
-    )
   endif
 endif

docs/reference/gsk/gsk4.toml.in

@@ -66,7 +66,3 @@ content_images = [
 ]
 content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gsk/"
 urlmap_file = "urlmap.js"
-
-[[object]]
-name = "INCLUDE_WARNING"
-hidden = true

docs/reference/gsk/meson.build

@@ -30,16 +30,4 @@ if get_option('documentation')
     install: true,
     install_dir: docs_dir,
   )
-
-  test('doc-check-gsk',
-    gidocgen,
-    args: [
-      'check',
-      '--config', gsk4_toml,
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      gsk_gir[0],
-    ],
-    depends: gsk_gir[0],
-    suite: ['docs'],
-  )
 endif

docs/reference/gtk/css-overview.md

@@ -74,7 +74,6 @@ in a selector, widget names must be prefixed with a # character.
 | E:not(selector) | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#negation) | |
 | E:dir(ltr), E:dir(rtl) | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#the-dir-pseudo) | |
 | E:drop(active) | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#drag-pseudos) | |
-| E:root | [CSS Selector Level 3](https://www.w3.org/TR/selectors-3/#root-pseudo) | |
 | E F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#descendent-combinators) | |
 | E > F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#child-combinators) | |
 | E ~ F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#general-sibling-combinators) | |

docs/reference/gtk/css-properties.md

@@ -15,16 +15,16 @@ spec.
 The following units are supported for basic datatypes:
 
 Length
-: px, pt, em, ex, rem, pc, in, cm, mm
+: px, pt, em, ex, rem, pc, in, cm, mm, calc()
 
 Percentage
-: %
+: %, calc()
 
 Angle
-: deg, rad, grad, turn
+: deg, grad, turn, calc()
 
 Time
-: s, ms
+: s, ms, calc()
 
 Length values with the em or ex units are resolved using the font
 size value, unless they occur in setting the font-size itself, in
@@ -33,15 +33,11 @@ which case they are resolved using the inherited font size value.
 The rem unit is resolved using the initial font size value, which is
 not quite the same as the CSS definition of rem.
 
-Length values using physical units (pt, pc, in, cm, mm) are translated
-to px using the dpi value specified by the -gtk-dpi property, which is
-different from the CSS definition, which uses a fixed dpi of 96.
-
-The calc() notation adds considerable expressive power to all of these
-datatypes. There are limits on what types can be combined in such an
-expression (e.g. it does not make sense to add a number and a time).
-For the full details, see the
-[CSS Values and Units](https://www.w3.org/TR/css-values-4/) spec.
+The calc() notation adds considerable expressive power. There are limits
+on what types can be combined in such an expression (e.g. it does not make
+sense to add a number and a time). For the full details, see the
+[CSS3 Values and Units](https://www.w3.org/TR/css3-values/#calc-notation)
+spec.
 
 A common pattern among shorthand properties (called 'four sides') is one
 where one to four values can be specified, to determine a value for each
@@ -60,80 +56,38 @@ follows:
 1 value:
 : all
 
-## Custom Properties
-
-GTK supports custom properties as defined in the
-[CSS Custom Properties for Cascading Variables](https://www.w3.org/TR/css-variables-1)
-spec.
-
-Custom properties are defined as follows:
-
-```css
---prop: red;
-```
-
-and used via the `var` keyword:
-
-```css
-color: var(--prop);
-```
-
-Custom properties can have a fallback for when the referred property is invalid:
-
-```css
-color: var(--prop, green);
-```
-
 ## Colors
 
-### CSS Colors
-
-Colors can be expressed in numerous ways in CSS (see the
-[Color Module](https://www.w3.org/TR/css-color-5/). GTK supports
-many (but not all) of these.
-
-You can use rgb(), rgba(), hsl() with both the legacy or the modern CSS
-syntax, and calc() can be used as well in color expressions. hwb(), oklab(),
-oklch(), color(), color-mix() and relative colors are supported as well.
-
-### Non-CSS Colors
-
-GTK  extends the CSS syntax with several additional ways to specify colors.
-
-These extensions are deprecated and should be replaced by the equivalent
-standard CSS notions.
+GTK extends the CSS syntax with several additional ways to specify colors.
 
 The first is a reference to a color defined via a @define-color rule in CSS.
 The syntax for @define-color rules is as follows:
 
 ```
-@define-color name color
+@define-color Name Color
 ```
 
 To refer to the color defined by a @define-color rule, prefix the name with @.
 
-The standard CSS mechanisms that should be used instead of @define-color are
-custom properties, :root and var().
-
 GTK also supports color expressions, which allow colors to be transformed to
 new ones. Color expressions can be nested, providing a rich language to
 define colors. Color expressions resemble functions, taking 1 or more colors
 and in some cases a number as arguments.
 
-`lighter(color)`
- : produces a brighter variant of `color`.
+`lighter(Color)`
+ : produces a brighter variant of Color
 
-`darker(color)`
- : produces a darker variant of `color`.
+`darker(Color)`
+ : produces a darker variant of Color
 
-`shade(color, number)`
- : changes the lightness of `color`. The `number` ranges from 0 for black to 2 for white.
+`shade(Color, Number)`
+ : changes the lightness of Color. The number ranges from 0 for black to 2 for white.
 
-`alpha(color, number)`
- : multiplies the alpha value of `color` by `number` (between 0 and 1).
+`alpha(Color, Number)`
+ : replaces the alpha value of color with number (between 0 and 1)
 
-`mix(color1, color2, number)`
- : interpolates between the two colors.
+`mix(Color1, Color2, Number)`
+ : interpolates between the two colors
 
 ## Images
 
@@ -141,7 +95,7 @@ GTK extends the CSS syntax for images and also uses it for specifying icons.
 To load a themed icon, use
 
 ```
--gtk-icontheme(name)
+-gtk-icontheme(Name)
 ```
 
 The specified icon name is used to look up a themed icon, while taking into
@@ -170,14 +124,14 @@ and the
 syntax makes this available. -gtk-recolor requires a url as first argument.
 The remaining arguments specify the color palette to use. If the palette is
 not explicitly specified, the current value of the -gtk-icon-palette property
-is used.
+is used. 
 
 GTK supports scaled rendering on hi-resolution displays. This works best if
 images can specify normal and hi-resolution variants. From CSS, this can be
 done with
 
 ```
--gtk-scaled(image1, image2)
+-gtk-scaled(Image1, Image2)
 ```
 
 ## GTK CSS Properties

docs/reference/gtk/drawing-model.md

@@ -99,15 +99,16 @@ reaches the requested phase. However, in practice most things
 happen at higher levels:
 
 - If you are doing an animation, you can use
-  [method@Gtk.Widget.add_tick_callback] which will cause a regular
+  gtk_widget_add_tick_callback() which will cause a regular
   beating of the clock with a callback in the Update phase
   until you stop the tick.
 - If some state changes that causes the size of your widget to
-  change you call [method@Gtk.Widget.queue_resize] which will request
+  change you call gtk_widget_queue_resize() which will request
   a Layout phase and mark your widget as needing relayout.
-- If some state changes so you need to redraw your widget you
-  use [method@Gtk.Widget.queue_draw] to request a Paint phase for
-  your widget.
+- If some state changes so you need to redraw some area of
+  your widget you use the normal gtk_widget_queue_draw()
+  set of functions. These will request a Paint phase and
+  mark the region as needing redraw.
 
 There are also a lot of implicit triggers of these from the
 CSS layer (which does animations, resizes and repaints as needed).

docs/reference/gtk/gtk4-broadwayd.rst

@@ -8,10 +8,6 @@ gtk4-broadwayd
 The Broadway display server
 ---------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-broadwayd** [OPTIONS...] <DISPLAY>

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

@@ -8,10 +8,6 @@ gtk4-builder-tool
 GtkBuilder File Utility
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-builder-tool** <COMMAND> [OPTIONS...] <FILE>

docs/reference/gtk/gtk4-demo-application.rst

@@ -8,9 +8,6 @@ gtk4-demo-application
 Demonstrate GtkApplication
 --------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
 
 SYNOPSIS
 --------

docs/reference/gtk/gtk4-demo.rst

@@ -8,10 +8,6 @@ gtk4-demo
 Demonstrate GTK widgets
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-encode-symbolic-svg.rst

@@ -8,10 +8,6 @@ gtk4-encode-symbolic-svg
 Symbolic icon conversion utility
 --------------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-icon-browser.rst

@@ -8,10 +8,6 @@ gtk4-icon-browser
 List themed icons
 -----------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-launch.rst

@@ -8,10 +8,6 @@ gtk4-launch
 Launch an application
 ---------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-node-editor.rst

@@ -8,10 +8,6 @@ gtk4-node-editor
 Editor render nodes
 -----------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

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

@@ -8,10 +8,6 @@ gtk4-path-tool
 GskPath Utility
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>

docs/reference/gtk/gtk4-query-settings.rst

@@ -8,10 +8,6 @@ gtk4-query-settings
 Print name and value of GTK settings
 ------------------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

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

@@ -8,17 +8,12 @@ gtk4-rendernode-tool
 GskRenderNode Utility
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
 |
 |   **gtk4-rendernode-tool** benchmark [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** compare [OPTIONS...] <FILE1> <FILE2>
-|   **gtk4-rendernode-tool** extract [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
 |   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
@@ -50,14 +45,13 @@ without any titlebar.
 Rendering
 ^^^^^^^^^
 
-The ``render`` command saves a rendering of the rendernode as a png, tiff or svg
-image or as pdf document. The name of the file to write can be specified as a second
-FILE argument.
+The ``render`` command saves a rendering of the rendernode as a png or tiff image.
+The name of the file to write can be specified as a second FILE argument.
 
 ``--renderer=RENDERER``
 
   Use the given renderer. Use ``--renderer=help`` to get a information
-  about possible values for the ``RENDERER``.
+  about poassible values for the ``RENDERER``.
 
 Benchmark
 ^^^^^^^^^
@@ -99,16 +93,4 @@ exit code is 1. If the images are identical, it is 0.
 
 ``--quiet``
 
-  Don't write results to stdout.
-
-
-Extract
-^^^^^^^
-
-The ``extract`` command saves all the data urls found in a node file to a given
-directory. The file names for the extracted files are derived from the mimetype
-of the url.
-
-``--dir=DIRECTORY``
-
-  Save extracted files in ``DIRECTORY`` (defaults to the current directory).
+  Don't write results to stdout.`

docs/reference/gtk/gtk4-update-icon-cache.rst

@@ -8,10 +8,6 @@ gtk4-update-icon-cache
 Icon theme caching utility
 --------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-widget-factory.rst

@@ -8,10 +8,6 @@ gtk4-widget-factory
 Showcase GTK widgets and styles
 -------------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4.toml.in

@@ -77,13 +77,11 @@ content_files = [
   "section-tree-widget.md",
   "migrating-2to4.md",
   "migrating-3to4.md",
-  "migrating-4to5.md",
   "broadway.md",
   "osx.md",
   "wayland.md",
   "windows.md",
   "x11.md",
-  "tools.md",
   "visual_index.md",
 ]
 content_images = [
@@ -251,12 +249,3 @@ content_images = [
 ]
 content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gtk/"
 urlmap_file = "urlmap.js"
-
-[[object]]
-name = "StyleProvider"
-  [[object.signal]]
-  name = "gtk-private-changed"
-  hidden = true
-
-[check]
-skip_deprecated = true

docs/reference/gtk/input-handling.md

@@ -140,11 +140,6 @@ capture phase, and key bindings locally, during the target phase.
 Under the hood, all shortcuts are represented as instances of `GtkShortcut`,
 and they are managed by `GtkShortcutController`.
 
-Note that GTK does not do anything to map the primary shortcut modifier
-to <kbd>Command</kbd> on macOS. If you want to let your application to follow
-macOS user experience conventions, you must create macOS-specific keyboard shortcuts.
-The <kbd>Command</kbd> is named `Meta` (`GDK_META_MASK`) in GTK.
-
 ## Text input
 
 When actual text input is needed (i.e. not just keyboard shortcuts),

docs/reference/gtk/meson.build

@@ -14,7 +14,6 @@ expand_content_md_files = [
   'running.md',
   'migrating-2to4.md',
   'migrating-3to4.md',
-  'migrating-4to5.md',
   'actions.md',
   'input-handling.md',
   'drawing-model.md',
@@ -26,8 +25,7 @@ expand_content_md_files = [
   'section-tree-widget.md',
   'section-list-widget.md',
   'question_index.md',
-  'visual_index.md',
-  'tools.md',
+  'visual_index.md'
 ]
 
 gtk_images = []
@@ -62,51 +60,39 @@ if get_option('documentation')
     build_by_default: true,
     install: true,
     install_dir: docs_dir,
-    install_tag: 'doc',
-  )
-
-  test('doc-check-gtk',
-    gidocgen,
-    args: [
-      'check',
-      '--config', gtk4_toml,
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      gtk_gir[0],
-    ],
-    depends: gtk_gir[0],
-    suite: ['docs'],
   )
 endif
 
-rst2man = find_program('rst2man', 'rst2man.py', required: get_option('man-pages'))
-rst2html5 = find_program('rst2html5', 'rst2html5.py', required: get_option('documentation'))
+rst2man = find_program('rst2man', 'rst2man.py', required: false)
+if get_option('man-pages') and not rst2man.found()
+  error('No rst2man found, but man pages were explicitly enabled')
+endif
 
-rst_files = [
-  [ 'gtk4-broadwayd', '1' ],
-  [ 'gtk4-builder-tool', '1' ],
-  [ 'gtk4-encode-symbolic-svg', '1', ],
-  [ 'gtk4-launch', '1', ],
-  [ 'gtk4-query-settings', '1', ],
-  [ 'gtk4-rendernode-tool', '1' ],
-  [ 'gtk4-update-icon-cache', '1', ],
-  [ 'gtk4-path-tool', '1', ],
-]
-
-if get_option('build-demos')
-  rst_files += [
-    [ 'gtk4-demo', '1', ],
-    [ 'gtk4-demo-application', '1', ],
-    [ 'gtk4-widget-factory', '1', ],
-    [ 'gtk4-icon-browser', '1', ],
-    [ 'gtk4-node-editor', '1', ],
+if get_option('man-pages') and rst2man.found()
+  rst_files = [
+    [ 'gtk4-broadwayd', '1' ],
+    [ 'gtk4-builder-tool', '1' ],
+    [ 'gtk4-encode-symbolic-svg', '1', ],
+    [ 'gtk4-launch', '1', ],
+    [ 'gtk4-query-settings', '1', ],
+    [ 'gtk4-rendernode-tool', '1' ],
+    [ 'gtk4-update-icon-cache', '1', ],
+    [ 'gtk4-path-tool', '1', ],
   ]
-endif
 
-rst2x_flags = [
-  '--syntax-highlight=none',
-]
+  if get_option('demos')
+    rst_files += [
+      [ 'gtk4-demo', '1', ],
+      [ 'gtk4-demo-application', '1', ],
+      [ 'gtk4-widget-factory', '1', ],
+      [ 'gtk4-icon-browser', '1', ],
+      [ 'gtk4-node-editor', '1', ],
+    ]
+  endif
 
-if get_option('man-pages')
+  rst2man_flags = [
+    '--syntax-highlight=none',
+  ]
 
   foreach rst: rst_files
     man_name = rst[0]
@@ -117,34 +103,12 @@ if get_option('man-pages')
       output: '@0@.@1@'.format(man_name, man_section),
       command: [
         rst2man,
-        rst2x_flags,
+        rst2man_flags,
         '@INPUT@',
       ],
       capture: true,
       install: true,
       install_dir: get_option('mandir') / 'man@0@'.format(man_section),
-      install_tag: 'doc',
-    )
-  endforeach
-endif
-
-if get_option('documentation')
-
-  foreach rst: rst_files
-    man_name = rst[0]
-
-    custom_target(
-      input: '@0@.rst'.format(man_name),
-      output: '@0@.html'.format(man_name),
-      command: [
-        rst2html5,
-        rst2x_flags,
-        '@INPUT@',
-      ],
-      capture: true,
-      install: true,
-      install_dir: docs_dir / 'gtk4',
-      install_tag: 'doc',
     )
   endforeach
 endif

docs/reference/gtk/migrating-3to4.md

@@ -451,11 +451,11 @@ hint about how modifiers are expected to be used. It also promoted
 the use of `<Primary>` instead of `<Control>` to specify accelerators that
 adapt to platform conventions.
 
-In GTK 4, the meaning of modifiers has been fixed, and applications are
+In GTK 4, the meaning of modifiers has been fixed, and backends are
 expected to map the platform conventions to the existing modifiers.
 The expected use of modifiers in GTK 4 is:
 
-`GDK_CONTROL_MASK` (`GDK_META_MASK` on macOS)
+`GDK_CONTROL_MASK`
  : Primary accelerators
 
 `GDK_ALT_MASK`
@@ -464,7 +464,7 @@ The expected use of modifiers in GTK 4 is:
 `GDK_SHIFT_MASK`
  : Extending selections
 
-`GDK_CONTROL_MASK` (`GDK_META_MASK` on macOS)
+`GDK_CONTROL_MASK`
  : Modifying selections
 
 `GDK_CONTROL_MASK|GDK_ALT_MASK`
@@ -473,15 +473,9 @@ The expected use of modifiers in GTK 4 is:
 Consequently, `GdkModifierIntent` and related APIs have been removed,
 and `<Control>` is preferred over `<Primary>` in accelerators.
 
-In GTK 3 on macOS, the `<Primary>` modifier mapped to  the <kbd>Command</kbd> key.
-In GTK 4, this is no longer the case: `<Primary>` is synonymous to `<Control>`.
-If you want to make your application to feel native on macOS,
-you need to add accelerators for macOS that use the `<Meta>` modifier.
-
 A related change is that GTK 4 no longer supports the use of archaic
 X11 'real' modifiers with the names Mod1,..., Mod5, and `GDK_MOD1_MASK`
-has been renamed to `GDK_ALT_MASK` and `GDK_MOD2_MASK` has been renamed to
-`GDK_META_MASK`.
+has been renamed to `GDK_ALT_MASK`.
 
 ### Replace `GtkClipboard` with `GdkClipboard`
 

docs/reference/gtk/migrating-4to5.md

@@ -58,7 +58,7 @@ use a GtkLabel.
 If you have a need for custom drawing that fits into the current
 (dark or light) theme, e.g. for rendering a graph, you can still
 get the current style foreground color, using
-[method@Gtk.Widget.get_color].
+[method@Gtk.Widget.get_style_color].
 
 ## Local stylesheets are going away
 
@@ -73,103 +73,6 @@ GTK 5 will no longer provide this functionality. The recommendations
 is to use a global stylesheet (i.e. gtk_style_context_add_provider_for_display())
 and rely on style classes to make your CSS apply only where desired.
 
-## Non-standard CSS extensions are going away
-
-GTK's CSS machinery has a some non-standard extensions around colors:
-named colors with \@define-color and color functions: lighter(), darker(),
-shade(), alpha(), mix().
-
-GTK now implements equivalent functionality from the CSS specs.
-
-### \@define-color is going away
-
-\@define-color should be replaced by custom properties in the :root scope.
-
-Instead of
-
-```
-@define-color fg_color #2e3436
-
-...
-
-box {
-  color: @fg_color;
-}
-```
-
-use
-
-```
-:root {
-  --fg-color: #2e3436;
-}
-
-...
-
-box {
-  color: var(--fg-color);
-}
-```
-
-For more information about custom CSS properties and variables, see the
-[CSS Custom Properties for Cascading Variables](https://www.w3.org/TR/css-variables-1/)
-spec.
-
-### Color expressions are going away
-
-The color functions can all be replaced by combinations of calc() and color-mix().
-
-ligher(c) and darker(c) are just shade(c, 1.3) or shade(c, 0.7), respectively, and
-thus can be handled the same way as shade in the examples below.
-
-Replace
-
-```
-a {
-  color: mix(red, green, 0.8);
-}
-
-b {
-  color: alpha(green, 0.6);
-}
-
-c {
-  color: shade(red, 1.3);
-}
-
-d {
-  color: shade(red, 0.7);
-}
-```
-
-with
-
-```
-a {
-  color: color-mix(in srgb, red, green 80%);
-}
-
-b {
-  color: rgb(from green, r g b / calc(alpha * 0.6));
-}
-
-c {
-  color: hsl(from red, h calc(s * 1.3) calc(l * 1.3));
-}
-
-d {
-  color: hsl(from red, h calc(s * 0.7) calc(l * 0.7));
-}
-```
-
-Variations of these replacements are possible.
-
-Note that GTK has historically computed mix() and shade() values in the SRGB and HSL
-colorspaces, but using OKLAB instead might yield slightly better results.
-
-For more information about color-mix(), see the
-[CSS Color](https://drafts.csswg.org/css-color-5) spec.
-
 ## Chooser interfaces are going away
 
 The GtkColorChooser, GtkFontChooser, GtkFileChooser and GtkAppChooser

docs/reference/gtk/overview.md

@@ -64,6 +64,6 @@ GTK is divided into three parts:
 [cairo]: https://www.cairographics.org/manual/
 [opengl]: https://www.opengl.org/about/
 [vulkan]: https://www.vulkan.org/
-[pango]: https://docs.gtk.org/Pango/
+[pango]: https://docs.gtk.org/pango/
 [gdkpixbuf]: https://docs.gtk.org/gdk-pixbuf/
 [graphene]: https://ebassi.github.io/graphene/

docs/reference/gtk/running.md

@@ -217,10 +217,6 @@ A number of options affect behavior instead of logging:
 `no-portals`
 : Disable use of [portals](https://docs.flatpak.org/en/latest/portals.html)
 
-`force-offload`
-: Force graphics offload for all textures, even when slower. This allows
-  to debug offloading in the absence of dmabufs.
-
 `gl-disable`
 : Disable OpenGL support
 

docs/reference/gtk/section-accessibility.md

@@ -155,7 +155,6 @@ Each property name is part of the `GtkAccessibleProperty` enumeration.
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_MIN | “aria-valuemin” | double |
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_NOW | “aria-valuenow” | double |
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT | “aria-valuetext” | translatable string |
-| %GTK_ACCESSIBLE_PROPERTY_HELP_TEXT | N/A | translatable string |
 
 #### List of accessible relations
 
@@ -217,10 +216,6 @@ are accessible as part of the development process. The GTK Inspector shows
 the accessible attributes of each widget, and also provides an overlay that
 can highlight accessibility issues.
 
-If you support some non-standard keyboard interactions for a widget, you
-**should** set an appropriate `GTK_ACCESSIBLE_PROPERTY_HELP_TEXT` to help
-discoverability of the behavior.
-
 It is possible to set accessible attributes in UI files as well:
 ```xml
 <object class="GtkButton" id="button1">

docs/reference/gtk/tools.md

@@ -1,18 +0,0 @@
-Title: Tools and Demos
-
-GTK ships with a number of tools and demos that come with their own
-documentation in the form of man pages.
-
- - [gtk4-broadwayd](gtk4-broadwayd.html)
- - [gtk4-builder-tool](gtk4-builder-tool.html)
- - [gtk4-demo](gtk4-demo.html)
- - [gtk4-demo-application](gtk4-demo-application.html)
- - [gtk4-encode-symbolic-svg](gtk4-encode-symbolic-svg.html)
- - [gtk4-icon-browser](gtk4-icon-browser.html)
- - [gtk4-launch](gtk4-launch.html)
- - [gtk4-node-editor](gtk4-node-editor.html)
- - [gtk4-path-tool](gtk4-path-tool.html)
- - [gtk4-query-settings](gtk4-query-settings.html)
- - [gtk4-rendernode-tool](gtk4-rendernode-tool.html)
- - [gtk4-update-icon-cache](gtk4-update-icon-cache.html)
- - [gtk4-widget-factory](gtk4-widget-factory.html)

gdk/broadway/broadway.js

@@ -91,31 +91,6 @@ const GDK_META_MASK     = 1 << 28;
 
 var useDataUrls = window.location.search.includes("datauri");
 
-/* check if we are on Android and using Chrome */
-var isAndroidChrome = false;
-{
-    var ua = navigator.userAgent.toLowerCase();
-    if (ua.indexOf("android") > -1 && ua.indexOf("chrom") > -1) {
-	isAndroidChrome = true;
-    }
-}
-/* check for the passive option for Event listener */
-let passiveSupported = false;
-try {
-    const options = {
-	get passive() { // This function will be called when the browser
-            //   attempts to access the passive property.
-	    passiveSupported = true;
-	    return false;
-	}
-    };
-
-    window.addEventListener("test", null, options);
-    window.removeEventListener("test", null, options);
-} catch(err) {
-    passiveSupported = false;
-}
-
 /* This base64code is based on https://github.com/beatgammit/base64-js/blob/master/index.js which is MIT licensed */
 
 var b64_lookup = [];
@@ -240,32 +215,11 @@ function logStackTrace(len) {
         log(callstack[i]);
 }
 
-/* Helper functions for touch identifier to make it unique on Android */
-var globalTouchIdentifier = Math.round(Date.now() / 1000);
-function touchIdentifierStart(tId)
-{
-    if (isAndroidChrome) {
-	if (tId == 0) {
-	    return ++globalTouchIdentifier;
-	}
-	return globalTouchIdentifier + tId;
-    }
-    return tId;
-}
-function touchIdentifier(tId)
-{
-    if (isAndroidChrome) {
-	return globalTouchIdentifier + tId;
-    }
-    return tId;
-}
-
 var grab = new Object();
 grab.surface = null;
 grab.ownerEvents = false;
 grab.implicit = false;
 var keyDownList = [];
-var inputList = [];
 var lastSerial = 0;
 var lastX = 0;
 var lastY = 0;
@@ -1033,14 +987,7 @@ function handleDisplayCommands(display_commands)
             break;
         case DISPLAY_OP_DELETE_SURFACE:
             var id = cmd[1];
-	    if (id == surfaceWithMouse) {
-		surfaceWithMouse = 0;
-	    }
-	    if (id == realSurfaceWithMouse) {
-		realSurfaceWithMouse = 0;
-		firstTouchDownId = null;
-	    }
-           delete surfaces[id];
+            delete surfaces[id];
             break;
         case DISPLAY_OP_CHANGE_TEXTURE:
             var image = cmd[1];
@@ -1424,14 +1371,8 @@ function getEffectiveEventTarget (id) {
 function updateKeyboardStatus() {
     if (fakeInput != null && showKeyboardChanged) {
         showKeyboardChanged = false;
-        if (showKeyboard) {
-	    if (isAndroidChrome) {
-		fakeInput.blur();
-		fakeInput.value = ' '.repeat(80); // TODO: Should be exchange with broadway server
-		                                  // to bring real value here.
-	    }
+        if (showKeyboard)
             fakeInput.focus();
-	}
         else
             fakeInput.blur();
     }
@@ -2983,19 +2924,6 @@ function pushKeyEvent(fev) {
     keyDownList.push(fev);
 }
 
-function copyInputEvent(ev) {
-    var members = ['inputType', 'data'], i, obj = {};
-    for (i = 0; i < members.length; i++) {
-	if (typeof ev[members[i]] !== "undefined")
-	    obj[members[i]] = ev[members[i]];
-    }
-    return obj;
-}
-
-function pushInputEvent(fev) {
-    inputList.push(fev);
-}
-
 function getKeyEvent(keyCode, pop) {
     var i, fev = null;
     for (i = keyDownList.length-1; i >= 0; i--) {
@@ -3094,29 +3022,6 @@ function handleKeyUp(e) {
         keysym = fev.keysym;
     else {
         //log("Key event (keyCode = " + ev.keyCode + ") not found on keyDownList");
-	if (isAndroidChrome && (ev.keyCode == 229)) {
-	    var i, fev = null, len = inputList.length, str;
-	    for (i = 0; i < len; i++) {
-		fev = inputList[i];
-		switch(fev.inputType) {
-		case "deleteContentBackward":
-		    sendInput(BROADWAY_EVENT_KEY_PRESS, [65288, lastState]);
-		    sendInput(BROADWAY_EVENT_KEY_RELEASE, [65288, lastState]);
-		    break;
-		case "insertText":
-		    if (fev.data !== undefined) {
-			for (let sym of fev.data) {
-			    sendInput(BROADWAY_EVENT_KEY_PRESS, [sym.codePointAt(0), lastState]);
-			    sendInput(BROADWAY_EVENT_KEY_RELEASE, [sym.codePointAt(0), lastState]);
-			}
-		    }
-		    break;
-		default:
-		    break;
-		}
-	    }
-	    inputList.splice(0, len);
-	}
         keysym = 0;
     }
 
@@ -3125,16 +3030,6 @@ function handleKeyUp(e) {
     return cancelEvent(ev);
 }
 
-function handleInput (e)  {
-    var fev = null, ev = (e ? e : window.event), keysym = null, suppress = false;
-
-    fev = copyInputEvent(ev);
-    pushInputEvent(fev);
-
-    // Stop keypress events just in case
-    return cancelEvent(ev);
-}
-
 function onKeyDown (ev) {
     updateForEvent(ev);
     return handleKeyDown(ev);
@@ -3150,11 +3045,6 @@ function onKeyUp (ev) {
     return handleKeyUp(ev);
 }
 
-function onInput (ev) {
-    updateForEvent(ev);
-    return handleInput(ev);
-}
-
 function cancelEvent(ev)
 {
     ev = ev ? ev : window.event;
@@ -3186,14 +3076,13 @@ function onMouseWheel(ev)
 }
 
 function onTouchStart(ev) {
-    ev.preventDefault();
+    event.preventDefault();
 
     updateKeyboardStatus();
     updateForEvent(ev);
 
     for (var i = 0; i < ev.changedTouches.length; i++) {
         var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifierStart(touch.identifier);
 
         var origId = getSurfaceId(touch);
         var id = getEffectiveEventTarget (origId);
@@ -3201,7 +3090,7 @@ function onTouchStart(ev) {
         var isEmulated = 0;
 
         if (firstTouchDownId == null) {
-            firstTouchDownId = touchId;
+            firstTouchDownId = touch.identifier;
             isEmulated = 1;
 
             if (realSurfaceWithMouse != origId || id != surfaceWithMouse) {
@@ -3216,54 +3105,52 @@ function onTouchStart(ev) {
             }
         }
 
-        sendInput (BROADWAY_EVENT_TOUCH, [0, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [0, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
     }
 }
 
 function onTouchMove(ev) {
-    ev.preventDefault();
+    event.preventDefault();
 
     updateKeyboardStatus();
     updateForEvent(ev);
 
     for (var i = 0; i < ev.changedTouches.length; i++) {
         var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifier(touch.identifier);
 
         var origId = getSurfaceId(touch);
         var id = getEffectiveEventTarget (origId);
         var pos = getPositionsFromEvent(touch, id);
 
         var isEmulated = 0;
-        if (firstTouchDownId == touchId) {
+        if (firstTouchDownId == touch.identifier) {
             isEmulated = 1;
         }
 
-        sendInput (BROADWAY_EVENT_TOUCH, [1, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [1, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
     }
 }
 
 function onTouchEnd(ev) {
-    ev.preventDefault();
+    event.preventDefault();
 
     updateKeyboardStatus();
     updateForEvent(ev);
 
     for (var i = 0; i < ev.changedTouches.length; i++) {
         var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifier(touch.identifier);
 
         var origId = getSurfaceId(touch);
         var id = getEffectiveEventTarget (origId);
         var pos = getPositionsFromEvent(touch, id);
 
         var isEmulated = 0;
-        if (firstTouchDownId == touchId) {
+        if (firstTouchDownId == touch.identifier) {
             isEmulated = 1;
             firstTouchDownId = null;
         }
 
-        sendInput (BROADWAY_EVENT_TOUCH, [2, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [2, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
     }
 }
 
@@ -3280,11 +3167,11 @@ function setupDocument(document)
     document.onkeyup = onKeyUp;
 
     if (document.addEventListener) {
-	document.addEventListener('DOMMouseScroll', onMouseWheel, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('mousewheel', onMouseWheel, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchstart', onTouchStart, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchmove', onTouchMove, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchend', onTouchEnd, passiveSupported ? { passive: false, capture: false } : false);
+      document.addEventListener('DOMMouseScroll', onMouseWheel, false);
+      document.addEventListener('mousewheel', onMouseWheel, false);
+      document.addEventListener('touchstart', onTouchStart, false);
+      document.addEventListener('touchmove', onTouchMove, false);
+      document.addEventListener('touchend', onTouchEnd, false);
     } else if (document.attachEvent) {
       element.attachEvent("onmousewheel", onMouseWheel);
     }
@@ -3350,14 +3237,12 @@ function connect()
     };
 
     var iOS = /(iPad|iPhone|iPod)/g.test( navigator.userAgent );
-    if (iOS || isAndroidChrome) {
+    if (iOS) {
         fakeInput = document.createElement("input");
         fakeInput.type = "text";
         fakeInput.style.position = "absolute";
         fakeInput.style.left = "-1000px";
         fakeInput.style.top = "-1000px";
         document.body.appendChild(fakeInput);
-	if (isAndroidChrome)
-	    fakeInput.addEventListener('input', onInput, passiveSupported ? { passive: false, capture: false } : false);
     }
 }

gdk/gdk.c

@@ -122,7 +122,6 @@ static const GdkDebugKey gdk_debug_keys[] = {
 
   { "portals",         GDK_DEBUG_PORTALS, "Force use of portals" },
   { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals" },
-  { "force-offload",   GDK_DEBUG_FORCE_OFFLOAD, "Force graphics offload for all textures" },
   { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
   { "gl-no-fractional", GDK_DEBUG_GL_NO_FRACTIONAL, "Disable fractional scaling for OpenGL" },
   { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },

gdk/gdkarrayimpl.c

@@ -41,10 +41,8 @@ G_BEGIN_DECLS
 
 #ifdef GDK_ARRAY_NULL_TERMINATED
 #define GDK_ARRAY_REAL_SIZE(_size) ((_size) + 1)
-#define GDK_ARRAY_MAX_SIZE (G_MAXSIZE / sizeof (_T_) - 1)
 #else
 #define GDK_ARRAY_REAL_SIZE(_size) (_size)
-#define GDK_ARRAY_MAX_SIZE (G_MAXSIZE / sizeof (_T_))
 #endif
 
 /* make this readable */
@@ -179,23 +177,18 @@ G_GNUC_UNUSED static inline void
 gdk_array(reserve) (GdkArray *self,
                     gsize      n)
 {
-  gsize new_capacity, size, capacity;
+  gsize new_size, size;
 
-  if (G_UNLIKELY (n > GDK_ARRAY_MAX_SIZE))
-    g_error ("requesting array size of %zu, but maximum size is %zu", n, GDK_ARRAY_MAX_SIZE);
-
-  capacity = gdk_array(get_capacity) (self);
-  if (n <= capacity)
-     return;
+  if (n <= gdk_array(get_capacity) (self))
+    return;
 
   size = gdk_array(get_size) (self);
-  /* capacity * 2 can overflow, that's why we MAX() */
-  new_capacity = MAX (GDK_ARRAY_REAL_SIZE (n), capacity * 2);
+  new_size = ((gsize) 1) << g_bit_storage (MAX (GDK_ARRAY_REAL_SIZE (n), 16) - 1);
 
 #ifdef GDK_ARRAY_PREALLOC
   if (self->start == self->preallocated)
     {
-      self->start = g_new (_T_, new_capacity);
+      self->start = g_new (_T_, new_size);
       memcpy (self->start, self->preallocated, sizeof (_T_) * GDK_ARRAY_REAL_SIZE (size));
     }
   else
@@ -203,15 +196,15 @@ gdk_array(reserve) (GdkArray *self,
 #ifdef GDK_ARRAY_NULL_TERMINATED
   if (self->start == NULL)
     {
-      self->start = g_new (_T_, new_capacity);
+      self->start = g_new (_T_, new_size);
       *self->start = *(_T_[1]) { 0 };
     }
   else
 #endif
-    self->start = g_renew (_T_, self->start, new_capacity);
+    self->start = g_renew (_T_, self->start, new_size);
 
   self->end = self->start + size;
-  self->end_allocation = self->start + new_capacity;
+  self->end_allocation = self->start + new_size;
 #ifdef GDK_ARRAY_NULL_TERMINATED
   self->end_allocation--;
 #endif
@@ -319,7 +312,6 @@ gdk_array(get) (const GdkArray *self,
 #undef gdk_array_paste
 #undef gdk_array
 #undef GDK_ARRAY_REAL_SIZE
-#undef GDK_ARRAY_MAX_SIZE
 
 #undef GDK_ARRAY_BY_VALUE
 #undef GDK_ARRAY_ELEMENT_TYPE

gdk/gdkclipboard.c

@@ -522,6 +522,8 @@ gdk_clipboard_get_content (GdkClipboard *clipboard)
  *
  * If the clipboard is not local, this function does nothing but report success.
  *
+ * The @callback must call [method@Gdk.Clipboard.store_finish].
+ *
  * The purpose of this call is to preserve clipboard contents beyond the
  * lifetime of an application, so this function is typically called on
  * exit. Depending on the platform, the functionality may not be available
@@ -636,6 +638,9 @@ gdk_clipboard_read_internal (GdkClipboard        *clipboard,
  * Asynchronously requests an input stream to read the @clipboard's
  * contents from.
  *
+ * When the operation is finished @callback will be called. You must then
+ * call [method@Gdk.Clipboard.read_finish] to get the result of the operation.
+ *
  * The clipboard will choose the most suitable mime type from the given list
  * to fulfill the request, preferring the ones listed first.
  */
@@ -829,6 +834,9 @@ gdk_clipboard_read_value_internal (GdkClipboard        *clipboard,
  * Asynchronously request the @clipboard contents converted to the given
  * @type.
  *
+ * When the operation is finished @callback will be called. You must then call
+ * [method@Gdk.Clipboard.read_value_finish] to get the resulting `GValue`.
+ *
  * For local clipboard contents that are available in the given `GType`,
  * the value will be copied directly. Otherwise, GDK will try to use
  * [func@content_deserialize_async] to convert the clipboard's data.
@@ -887,6 +895,9 @@ gdk_clipboard_read_value_finish (GdkClipboard  *clipboard,
  *
  * Asynchronously request the @clipboard contents converted to a `GdkPixbuf`.
  *
+ * When the operation is finished @callback will be called. You must then
+ * call [method@Gdk.Clipboard.read_texture_finish] to get the result.
+ *
  * This is a simple wrapper around [method@Gdk.Clipboard.read_value_async].
  * Use that function or [method@Gdk.Clipboard.read_async] directly if you
  * need more control over the operation.
@@ -949,6 +960,9 @@ gdk_clipboard_read_texture_finish (GdkClipboard  *clipboard,
  *
  * Asynchronously request the @clipboard contents converted to a string.
  *
+ * When the operation is finished @callback will be called. You must then
+ * call [method@Gdk.Clipboard.read_text_finish] to get the result.
+ *
  * This is a simple wrapper around [method@Gdk.Clipboard.read_value_async].
  * Use that function or [method@Gdk.Clipboard.read_async] directly if you
  * need more control over the operation.

gdk/gdkcontentdeserializer.c

@@ -540,6 +540,9 @@ deserialize_not_found (GdkContentDeserializer *deserializer)
  *
  * The default I/O priority is %G_PRIORITY_DEFAULT (i.e. 0), and lower numbers
  * indicate a higher priority.
+ *
+ * When the operation is finished, @callback will be called. You must then
+ * call [func@Gdk.content_deserialize_finish] to get the result of the operation.
  */
 void
 gdk_content_deserialize_async (GInputStream        *stream,

gdk/gdkcontentprovider.c

@@ -279,6 +279,10 @@ gdk_content_provider_content_changed (GdkContentProvider *provider)
  * Asynchronously writes the contents of @provider to @stream in the given
  * @mime_type.
  *
+ * When the operation is finished @callback will be called. You must then call
+ * [method@Gdk.ContentProvider.write_mime_type_finish] to get the result
+ * of the operation.
+ *
  * The given mime type does not need to be listed in the formats returned by
  * [method@Gdk.ContentProvider.ref_formats]. However, if the given `GType` is
  * not supported, `G_IO_ERROR_NOT_SUPPORTED` will be reported.

gdk/gdkcontentserializer.c

@@ -546,6 +546,9 @@ serialize_not_found (GdkContentSerializer *serializer)
  *
  * The default I/O priority is %G_PRIORITY_DEFAULT (i.e. 0), and lower numbers
  * indicate a higher priority.
+ *
+ * When the operation is finished, @callback will be called. You must then
+ * call [func@Gdk.content_serialize_finish] to get the result of the operation.
  */
 void
 gdk_content_serialize_async (GOutputStream       *stream,

gdk/gdkcursor.c

@@ -156,9 +156,6 @@ gdk_cursor_finalize (GObject *object)
   g_clear_object (&cursor->texture);
   g_clear_object (&cursor->fallback);
 
-  if (cursor->destroy)
-    cursor->destroy (cursor->data);
-
   G_OBJECT_CLASS (gdk_cursor_parent_class)->finalize (object);
 }
 
@@ -256,11 +253,6 @@ gdk_cursor_hash (gconstpointer pointer)
     hash ^= g_str_hash (cursor->name);
   else if (cursor->texture)
     hash ^= g_direct_hash (cursor->texture);
-  else if (cursor->callback)
-    {
-      hash ^= g_direct_hash (cursor->callback);
-      hash ^= g_direct_hash (cursor->data);
-    }
 
   hash ^= (cursor->hotspot_x << 8) | cursor->hotspot_y;
 
@@ -289,10 +281,6 @@ gdk_cursor_equal (gconstpointer a,
       ca->hotspot_y != cb->hotspot_y)
     return FALSE;
 
-  if (ca->callback != cb->callback ||
-      ca->data != cb->data)
-    return FALSE;
-
   return TRUE;
 }
 
@@ -367,45 +355,6 @@ gdk_cursor_new_from_texture (GdkTexture *texture,
                        NULL);
 }
 
-/**
- * gdk_cursor_new_from_callback:
- * @callback: the `GdkCursorGetTextureCallback`
- * @data: data to pass to @callback
- * @destroy: destroy notify for @data
- * @fallback: (nullable): the `GdkCursor` to fall back to when
- *   this one cannot be supported
- *
- * Creates a new callback-based cursor object.
- *
- * Cursors of this kind produce textures for the cursor
- * image on demand, when the @callback is called.
- *
- * Returns: (nullable): a new `GdkCursor`
- *
- * Since: 4.16
- */
-GdkCursor *
-gdk_cursor_new_from_callback (GdkCursorGetTextureCallback  callback,
-                              gpointer                     data,
-                              GDestroyNotify               destroy,
-                              GdkCursor                   *fallback)
-{
-  GdkCursor *cursor;
-
-  g_return_val_if_fail (callback != NULL, NULL);
-  g_return_val_if_fail (fallback == NULL || GDK_IS_CURSOR (fallback), NULL);
-
-  cursor = g_object_new (GDK_TYPE_CURSOR,
-                         "fallback", fallback,
-                         NULL);
-
-  cursor->callback = callback;
-  cursor->data = data;
-  cursor->destroy = destroy;
-
-  return cursor;
-}
-
 /**
  * gdk_cursor_get_fallback: (attributes org.gtk.Method.get_property=fallback)
  * @cursor: a `GdkCursor`
@@ -510,22 +459,3 @@ gdk_cursor_get_hotspot_y (GdkCursor *cursor)
 
   return cursor->hotspot_y;
 }
-
-GdkTexture *
-gdk_cursor_get_texture_for_size (GdkCursor *cursor,
-                                 int        cursor_size,
-                                 double     scale,
-                                 int       *width,
-                                 int       *height,
-                                 int       *hotspot_x,
-                                 int       *hotspot_y)
-{
-  if (cursor->callback == NULL)
-    return NULL;
-
-  return cursor->callback (cursor,
-                           cursor_size, scale,
-                           width, height,
-                           hotspot_x, hotspot_y,
-                           cursor->data);
-}

gdk/gdkcursor.h

@@ -51,52 +51,6 @@ GDK_AVAILABLE_IN_ALL
 GdkCursor*  gdk_cursor_new_from_name     (const char      *name,
                                           GdkCursor       *fallback);
 
-/**
- * GdkCursorGetTextureCallback:
- * @cursor: the `GdkCursor`
- * @cursor_size: the nominal cursor size, in application pixels
- * @scale: the device scale
- * @width: (out): return location for the actual cursor width,
- *   in application pixels
- * @height: (out): return location for the actual cursor height,
- *   in application pixels
- * @hotspot_x: (out): return location for the hotspot X position,
- *   in application pixels
- * @hotspot_y: (out): return location for the hotspot Y position,
- *   in application pixels
- * @data: User data for the callback
- *
- * The type of callback used by a dynamic `GdkCursor` to generate
- * a texture for the cursor image at the given @cursor_size
- * and @scale.
- *
- * The actual cursor size in application pixels may be different
- * from @cursor_size x @cursor_size, and will be returned in
- * @width, @height. The returned texture should have a size that
- * corresponds to the actual cursor size, in device pixels (i.e.
- * application pixels, multiplied by @scale).
- *
- * This function may fail and return `NULL`, in which case
- * the fallback cursor will be used.
- *
- * Returns: (nullable) (transfer full): the cursor image, or
- *   `NULL` if none could be produced.
- */
-typedef GdkTexture * (* GdkCursorGetTextureCallback) (GdkCursor   *cursor,
-                                                      int          cursor_size,
-                                                      double       scale,
-                                                      int         *width,
-                                                      int         *height,
-                                                      int         *hotspot_x,
-                                                      int         *hotspot_y,
-                                                      gpointer     data);
-
-GDK_AVAILABLE_IN_4_16
-GdkCursor * gdk_cursor_new_from_callback (GdkCursorGetTextureCallback  callback,
-                                          gpointer                     data,
-                                          GDestroyNotify               destroy,
-                                          GdkCursor                   *fallback);
-
 GDK_AVAILABLE_IN_ALL
 GdkCursor * gdk_cursor_get_fallback      (GdkCursor       *cursor);
 GDK_AVAILABLE_IN_ALL

gdk/gdkcursorprivate.h

@@ -44,10 +44,6 @@ struct _GdkCursor
   GdkTexture *texture;
   int hotspot_x;
   int hotspot_y;
-
-  GdkCursorGetTextureCallback callback;
-  gpointer data;
-  GDestroyNotify destroy;
 };
 
 struct _GdkCursorClass
@@ -59,13 +55,5 @@ guint                   gdk_cursor_hash                         (gconstpointer
 gboolean                gdk_cursor_equal                        (gconstpointer          a,
                                                                  gconstpointer          b);
 
-GdkTexture *            gdk_cursor_get_texture_for_size         (GdkCursor *cursor,
-                                                                 int        cursor_size,
-                                                                 double     scale,
-                                                                 int       *width,
-                                                                 int       *height,
-                                                                 int       *hotspot_x,
-                                                                 int       *hotspot_y);
-
 G_END_DECLS
 

gdk/gdkdebugprivate.h

@@ -44,7 +44,7 @@ typedef enum {
   GDK_DEBUG_NO_PORTALS      = 1 << 15,
   GDK_DEBUG_GL_DISABLE      = 1 << 16,
   GDK_DEBUG_GL_NO_FRACTIONAL= 1 << 17,
-  GDK_DEBUG_FORCE_OFFLOAD   = 1 << 18,
+
   GDK_DEBUG_GL_DISABLE_GL   = 1 << 19,
   GDK_DEBUG_GL_DISABLE_GLES = 1 << 20,
   GDK_DEBUG_GL_PREFER_GL    = 1 << 21,

gdk/gdkdmabufegl.c

@@ -163,8 +163,6 @@ gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
     return NULL;
 
   previous = gdk_gl_context_get_current ();
-  if (previous)
-    g_object_ref (previous);
   formats = gdk_dmabuf_formats_builder_new ();
   external = gdk_dmabuf_formats_builder_new ();
 
@@ -196,10 +194,7 @@ gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
     }
 
   if (previous)
-    {
-      gdk_gl_context_make_current (previous);
-      g_object_unref (previous);
-    }
+    gdk_gl_context_make_current (previous);
 
   return GDK_DMABUF_DOWNLOADER (renderer);
 }

gdk/gdkdmabuftexture.c

@@ -25,7 +25,6 @@
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdmabuffourccprivate.h"
 #include "gdkdmabufprivate.h"
-#include "gdkdmabuftexturebuilderprivate.h"
 #include "gdktextureprivate.h"
 #include <gdk/gdkglcontext.h>
 #include <gdk/gdkgltexturebuilder.h>
@@ -62,13 +61,6 @@ struct _GdkDmabufTextureClass
   GdkTextureClass parent_class;
 };
 
-/**
- * gdk_dmabuf_error_quark:
- *
- * Registers an error quark for [class@Gdk.DmabufTexture] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-dmabuf-error-quark, gdk_dmabuf_error)
 
 G_DEFINE_TYPE (GdkDmabufTexture, gdk_dmabuf_texture, GDK_TYPE_TEXTURE)

gdk/gdkdmabuftexturebuilder.c

@@ -25,7 +25,6 @@
 #include "gdkdisplay.h"
 #include "gdkenumtypes.h"
 #include "gdkdmabuftextureprivate.h"
-#include "gdkdmabuftexturebuilderprivate.h"
 
 #include <cairo-gobject.h>
 
@@ -949,20 +948,22 @@ gdk_dmabuf_texture_builder_set_update_region (GdkDmabufTextureBuilder *self,
  *
  * Builds a new `GdkTexture` with the values set up in the builder.
  *
- * It is a programming error to call this function if any mandatory property has not been set.
+ * It is a programming error to call this function if any mandatory
+ * property has not been set.
  *
- * Not all formats defined in the `drm_fourcc.h` header are supported. You can use
- * [method@Gdk.Display.get_dmabuf_formats] to get a list of supported formats. If the
- * format is not supported by GTK, %NULL will be returned and @error will be set.
+ * If the dmabuf is not supported by GTK, %NULL will be returned and @error will be set.
  *
  * The `destroy` function gets called when the returned texture gets released.
  *
+ * It is possible to call this function multiple times to create multiple textures,
+ * possibly with changing properties in between.
+ *
  * It is the responsibility of the caller to keep the file descriptors for the planes
  * open until the created texture is no longer used, and close them afterwards (possibly
  * using the @destroy notify).
  *
- * It is possible to call this function multiple times to create multiple textures,
- * possibly with changing properties in between.
+ * Not all formats defined in the `drm_fourcc.h` header are supported. You can use
+ * [method@Gdk.Display.get_dmabuf_formats] to get a list of supported formats.
  *
  * Returns: (transfer full) (nullable): a newly built `GdkTexture` or `NULL`
  *   if the format is not supported
@@ -1003,19 +1004,3 @@ gdk_dmabuf_texture_builder_get_dmabuf (GdkDmabufTextureBuilder *self)
 {
   return &self->dmabuf;
 }
-
-void
-gdk_dmabuf_texture_builder_set_dmabuf (GdkDmabufTextureBuilder *self,
-                                       const GdkDmabuf         *dmabuf)
-{
-  gdk_dmabuf_texture_builder_set_fourcc (self, dmabuf->fourcc);
-  gdk_dmabuf_texture_builder_set_modifier (self, dmabuf->modifier);
-  gdk_dmabuf_texture_builder_set_n_planes (self, dmabuf->n_planes);
-
-  for (unsigned int i = 0; i < dmabuf->n_planes; i++)
-    {
-      gdk_dmabuf_texture_builder_set_fd (self, i, dmabuf->planes[i].fd);
-      gdk_dmabuf_texture_builder_set_stride (self, i, dmabuf->planes[i].stride);
-      gdk_dmabuf_texture_builder_set_offset (self, i, dmabuf->planes[i].offset);
-    }
-}

gdk/gdkdmabuftexturebuilderprivate.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include "gdkdmabuftexturebuilder.h"
-#include "gdkdmabufprivate.h"
-
-G_BEGIN_DECLS
-
-const GdkDmabuf *       gdk_dmabuf_texture_builder_get_dmabuf   (GdkDmabufTextureBuilder *builder);
-
-void                    gdk_dmabuf_texture_builder_set_dmabuf   (GdkDmabufTextureBuilder *builder,
-                                                                 const GdkDmabuf         *dmabuf);
-
-G_END_DECLS
-

gdk/gdkdmabuftextureprivate.h

@@ -7,6 +7,8 @@
 
 G_BEGIN_DECLS
 
+const GdkDmabuf *       gdk_dmabuf_texture_builder_get_dmabuf   (GdkDmabufTextureBuilder *builder);
+
 GdkTexture *            gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
                                                              GDestroyNotify           destroy,
                                                              gpointer                 data,

gdk/gdkdrop.c

@@ -134,7 +134,7 @@ gdk_drop_read_local_async (GdkDrop             *self,
 
   g_object_get (priv->drag, "content", &content, NULL);
   content_formats = gdk_content_provider_ref_formats (content);
-  g_object_unref (content);
+  g_object_unref (content); 
   content_formats = gdk_content_formats_union_serialize_mime_types (content_formats);
   mime_type = gdk_content_formats_match_mime_type (content_formats, formats);
 
@@ -784,7 +784,7 @@ gdk_drop_read_value_internal (GdkDrop             *self,
   GdkContentFormats *formats;
   GValue *value;
   GTask *task;
-
+ 
   g_return_if_fail (priv->state != GDK_DROP_STATE_FINISHED);
 
   task = g_task_new (self, cancellable, callback, user_data);
@@ -849,6 +849,10 @@ gdk_drop_read_value_internal (GdkDrop             *self,
  * Asynchronously request the drag operation's contents converted
  * to the given @type.
  *
+ * When the operation is finished @callback will be called. You must
+ * then call [method@Gdk.Drop.read_value_finish] to get the resulting
+ * `GValue`.
+ *
  * For local drag-and-drop operations that are available in the given
  * `GType`, the value will be copied directly. Otherwise, GDK will
  * try to use [func@Gdk.content_deserialize_async] to convert the data.

gdk/gdkenums.h

@@ -98,9 +98,9 @@ typedef enum
  * @GDK_BUTTON3_MASK: the third mouse button.
  * @GDK_BUTTON4_MASK: the fourth mouse button.
  * @GDK_BUTTON5_MASK: the fifth mouse button.
- * @GDK_SUPER_MASK: the Super modifier.
- * @GDK_HYPER_MASK: the Hyper modifier.
- * @GDK_META_MASK: the Meta modifier. Maps to Command on macOS.
+ * @GDK_SUPER_MASK: the Super modifier
+ * @GDK_HYPER_MASK: the Hyper modifier
+ * @GDK_META_MASK: the Meta modifier
  *
  * Flags to indicate the state of modifier keys and mouse buttons
  * in events.

gdk/gdkevents.c

@@ -1371,8 +1371,6 @@ gdk_event_get_modifier_state (GdkEvent *event)
  * Extract the event surface relative x/y coordinates from an event.
  *
  * This position is in [surface coordinates](coordinates.html).
- *
- * Returns: whether the positions were set
  */
 gboolean
 gdk_event_get_position (GdkEvent *event,

gdk/gdkglcontext.c

@@ -152,13 +152,6 @@ enum {
 
 static GParamSpec *properties[LAST_PROP] = { NULL, };
 
-/**
- * gdk_gl_error_quark:
- *
- * Registers an error quark for [class@Gdk.GLContext] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-gl-error-quark, gdk_gl_error)
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkGLContext, gdk_gl_context, GDK_TYPE_DRAW_CONTEXT)
@@ -1963,6 +1956,8 @@ gdk_gl_context_get_glsl_version_string (GdkGLContext *self)
         return "#version 310 es";
       else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
         return "#version 300 es";
+      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
+        return "#version 300 es";
       else
         return "#version 100";
     }

gdk/gdkgltexture.c

@@ -471,7 +471,8 @@ gdk_gl_texture_release (GdkGLTexture *self)
   g_return_if_fail (self->saved == NULL);
 
   texture = GDK_TEXTURE (self);
-  self->saved = GDK_TEXTURE (gdk_memory_texture_from_texture (texture));
+  self->saved = GDK_TEXTURE (gdk_memory_texture_from_texture (texture,
+                                                              gdk_texture_get_format (texture)));
 
   drop_gl_resources (self);
 }

gdk/gdkmemoryformat.c

@@ -327,7 +327,6 @@ ADD_ALPHA_FUNC(r8g8b8_to_a8b8g8r8, 0, 1, 2, 3, 2, 1, 0)
 
 struct _GdkMemoryFormatDescription
 {
-  const char *name;
   GdkMemoryAlpha alpha;
   GdkMemoryFormat premultiplied;
   GdkMemoryFormat straight;
@@ -367,7 +366,6 @@ struct _GdkMemoryFormatDescription
 
 static const GdkMemoryFormatDescription memory_formats[] = {
   [GDK_MEMORY_B8G8R8A8_PREMULTIPLIED] = {
-    .name = "*BGRA8",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED,
     .straight = GDK_MEMORY_B8G8R8A8,
@@ -396,7 +394,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = b8g8r8a8_premultiplied_from_float,
   },
   [GDK_MEMORY_A8R8G8B8_PREMULTIPLIED] = {
-    .name = "*ARGB8",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_A8R8G8B8_PREMULTIPLIED,
     .straight = GDK_MEMORY_A8R8G8B8,
@@ -425,7 +422,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = a8r8g8b8_premultiplied_from_float,
   },
   [GDK_MEMORY_R8G8B8A8_PREMULTIPLIED] = {
-    .name = "*RGBA8",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
     .straight = GDK_MEMORY_R8G8B8A8,
@@ -453,7 +449,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r8g8b8a8_premultiplied_from_float,
   },
   [GDK_MEMORY_A8B8G8R8_PREMULTIPLIED] = {
-    .name = "*ABGR8",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_A8B8G8R8_PREMULTIPLIED,
     .straight = GDK_MEMORY_A8B8G8R8,
@@ -482,7 +477,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = a8b8g8r8_premultiplied_from_float,
   },
   [GDK_MEMORY_B8G8R8A8] = {
-    .name = "BGRA8",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED,
     .straight = GDK_MEMORY_B8G8R8A8,
@@ -511,7 +505,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = b8g8r8a8_from_float,
   },
   [GDK_MEMORY_A8R8G8B8] = {
-    .name = "ARGB8",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_A8R8G8B8_PREMULTIPLIED,
     .straight = GDK_MEMORY_A8R8G8B8,
@@ -540,7 +533,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = a8r8g8b8_from_float,
   },
   [GDK_MEMORY_R8G8B8A8] = {
-    .name = "RGBA8",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
     .straight = GDK_MEMORY_R8G8B8A8,
@@ -568,7 +560,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r8g8b8a8_from_float,
   },
   [GDK_MEMORY_A8B8G8R8] = {
-    .name = "ABGR8",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_A8B8G8R8_PREMULTIPLIED,
     .straight = GDK_MEMORY_A8B8G8R8,
@@ -597,7 +588,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = a8b8g8r8_from_float,
   },
   [GDK_MEMORY_B8G8R8X8] = {
-    .name = "BGRX8",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_B8G8R8X8,
     .straight = GDK_MEMORY_B8G8R8X8,
@@ -627,7 +617,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = b8g8r8x8_from_float,
   },
   [GDK_MEMORY_X8R8G8B8] = {
-    .name = "XRGB8",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_X8R8G8B8,
     .straight = GDK_MEMORY_X8R8G8B8,
@@ -657,7 +646,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = x8r8g8b8_from_float,
   },
   [GDK_MEMORY_R8G8B8X8] = {
-    .name = "RGBX8",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_R8G8B8X8,
     .straight = GDK_MEMORY_R8G8B8X8,
@@ -686,7 +674,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r8g8b8x8_from_float,
   },
   [GDK_MEMORY_X8B8G8R8] = {
-    .name = "XBGR8",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_X8B8G8R8,
     .straight = GDK_MEMORY_X8B8G8R8,
@@ -716,7 +703,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = x8b8g8r8_from_float,
   },
   [GDK_MEMORY_R8G8B8] = {
-    .name = "RGB8",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_R8G8B8,
     .straight = GDK_MEMORY_R8G8B8,
@@ -745,7 +731,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r8g8b8_from_float,
   },
   [GDK_MEMORY_B8G8R8] = {
-    .name = "BGR8",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_B8G8R8,
     .straight = GDK_MEMORY_B8G8R8,
@@ -775,7 +760,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = b8g8r8_from_float,
   },
   [GDK_MEMORY_R16G16B16] = {
-    .name = "RGB16",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_R16G16B16,
     .straight = GDK_MEMORY_R16G16B16,
@@ -807,7 +791,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r16g16b16_from_float,
   },
   [GDK_MEMORY_R16G16B16A16_PREMULTIPLIED] = {
-    .name = "*RGBA16",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_R16G16B16A16_PREMULTIPLIED,
     .straight = GDK_MEMORY_R16G16B16A16,
@@ -838,7 +821,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r16g16b16a16_from_float,
   },
   [GDK_MEMORY_R16G16B16A16] = {
-    .name = "RGBA16",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_R16G16B16A16_PREMULTIPLIED,
     .straight = GDK_MEMORY_R16G16B16A16,
@@ -869,7 +851,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r16g16b16a16_from_float,
   },
   [GDK_MEMORY_R16G16B16_FLOAT] = {
-    .name = "RGBA16f",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_R16G16B16_FLOAT,
     .straight = GDK_MEMORY_R16G16B16_FLOAT,
@@ -900,7 +881,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r16g16b16_float_from_float,
   },
   [GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED] = {
-    .name = "*RGBA16f",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED,
     .straight = GDK_MEMORY_R16G16B16A16_FLOAT,
@@ -930,7 +910,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r16g16b16a16_float_from_float,
   },
   [GDK_MEMORY_R16G16B16A16_FLOAT] = {
-    .name = "RGBA16f",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED,
     .straight = GDK_MEMORY_R16G16B16A16_FLOAT,
@@ -960,7 +939,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r16g16b16a16_float_from_float,
   },
   [GDK_MEMORY_R32G32B32_FLOAT] = {
-    .name = "RGB32f",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_R32G32B32_FLOAT,
     .straight = GDK_MEMORY_R32G32B32_FLOAT,
@@ -991,7 +969,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r32g32b32_float_from_float,
   },
   [GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED] = {
-    .name = "*RGBA32f",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED,
     .straight = GDK_MEMORY_R32G32B32A32_FLOAT,
@@ -1021,7 +998,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r32g32b32a32_float_from_float,
   },
   [GDK_MEMORY_R32G32B32A32_FLOAT] = {
-    .name = "RGBA32f",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED,
     .straight = GDK_MEMORY_R32G32B32A32_FLOAT,
@@ -1051,7 +1027,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = r32g32b32a32_float_from_float,
   },
   [GDK_MEMORY_G8A8_PREMULTIPLIED] = {
-    .name = "*GA8",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_G8A8_PREMULTIPLIED,
     .straight = GDK_MEMORY_G8A8,
@@ -1080,7 +1055,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = g8a8_premultiplied_from_float,
   },
   [GDK_MEMORY_G8A8] = {
-    .name = "GA8",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_G8A8_PREMULTIPLIED,
     .straight = GDK_MEMORY_G8A8,
@@ -1109,7 +1083,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = g8a8_from_float,
   },
   [GDK_MEMORY_G8] = {
-    .name = "G8",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_G8,
     .straight = GDK_MEMORY_G8,
@@ -1138,7 +1111,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = g8_from_float,
   },
   [GDK_MEMORY_G16A16_PREMULTIPLIED] = {
-    .name = "*GA16",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_G16A16_PREMULTIPLIED,
     .straight = GDK_MEMORY_G16A16,
@@ -1170,7 +1142,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = g16a16_premultiplied_from_float,
   },
   [GDK_MEMORY_G16A16] = {
-    .name = "GA16",
     .alpha = GDK_MEMORY_ALPHA_STRAIGHT,
     .premultiplied = GDK_MEMORY_G16A16_PREMULTIPLIED,
     .straight = GDK_MEMORY_G16A16,
@@ -1202,7 +1173,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = g16a16_from_float,
   },
   [GDK_MEMORY_G16] = {
-    .name = "G16",
     .alpha = GDK_MEMORY_ALPHA_OPAQUE,
     .premultiplied = GDK_MEMORY_G16,
     .straight = GDK_MEMORY_G16,
@@ -1234,7 +1204,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = g16_from_float,
   },
   [GDK_MEMORY_A8] = {
-    .name = "A8",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_A8,
     .straight = GDK_MEMORY_A8,
@@ -1263,7 +1232,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = a8_from_float,
   },
   [GDK_MEMORY_A16] = {
-    .name = "A16",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_A16,
     .straight = GDK_MEMORY_A16,
@@ -1295,7 +1263,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = a16_from_float,
   },
   [GDK_MEMORY_A16_FLOAT] = {
-    .name = "A16f",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_A16_FLOAT,
     .straight = GDK_MEMORY_A16_FLOAT,
@@ -1326,7 +1293,6 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     .from_float = a16_float_from_float,
   },
   [GDK_MEMORY_A32_FLOAT] = {
-    .name = "A32f",
     .alpha = GDK_MEMORY_ALPHA_PREMULTIPLIED,
     .premultiplied = GDK_MEMORY_A32_FLOAT,
     .straight = GDK_MEMORY_A32_FLOAT,
@@ -1695,12 +1661,6 @@ gdk_memory_format_get_dmabuf_fourcc (GdkMemoryFormat format)
 #endif
 }
 
-const char *
-gdk_memory_format_get_name (GdkMemoryFormat format)
-{
-  return memory_formats[format].name;
-}
-
 static void
 premultiply (float *rgba,
              gsize  n)

gdk/gdkmemoryformatprivate.h

@@ -75,7 +75,7 @@ VkFormat                gdk_memory_format_vk_rgba_format    (GdkMemoryFormat
                                                              VkComponentMapping         *out_swizzle);
 #endif
 guint32                 gdk_memory_format_get_dmabuf_fourcc (GdkMemoryFormat             format);
-const char *            gdk_memory_format_get_name          (GdkMemoryFormat             format);
+
 
 void                    gdk_memory_convert                  (guchar                     *dest_data,
                                                              gsize                       dest_stride,

gdk/gdkmemorytexture.c

@@ -202,7 +202,8 @@ gdk_memory_texture_new_subtexture (GdkMemoryTexture  *source,
 }
 
 GdkMemoryTexture *
-gdk_memory_texture_from_texture (GdkTexture *texture)
+gdk_memory_texture_from_texture (GdkTexture      *texture,
+                                 GdkMemoryFormat  format)
 {
   GdkTexture *result;
   GBytes *bytes;
@@ -212,16 +213,21 @@ gdk_memory_texture_from_texture (GdkTexture *texture)
   g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
 
   if (GDK_IS_MEMORY_TEXTURE (texture))
-    return g_object_ref (GDK_MEMORY_TEXTURE (texture));
+    {
+      GdkMemoryTexture *memtex = GDK_MEMORY_TEXTURE (texture);
 
-  stride = texture->width * gdk_memory_format_bytes_per_pixel (texture->format);
+      if (gdk_texture_get_format (texture) == format)
+        return g_object_ref (memtex);
+    }
+
+  stride = texture->width * gdk_memory_format_bytes_per_pixel (format);
   data = g_malloc_n (stride, texture->height);
 
-  gdk_texture_do_download (texture, texture->format, data, stride);
+  gdk_texture_do_download (texture, format, data, stride);
   bytes = g_bytes_new_take (data, stride * texture->height);
   result = gdk_memory_texture_new (texture->width,
                                    texture->height,
-                                   texture->format,
+                                   format,
                                    bytes,
                                    stride);
   g_bytes_unref (bytes);

gdk/gdkmemorytextureprivate.h

@@ -28,7 +28,8 @@ G_BEGIN_DECLS
 #define GDK_MEMORY_GDK_PIXBUF_OPAQUE GDK_MEMORY_R8G8B8
 #define GDK_MEMORY_GDK_PIXBUF_ALPHA GDK_MEMORY_R8G8B8A8
 
-GdkMemoryTexture *      gdk_memory_texture_from_texture     (GdkTexture        *texture);
+GdkMemoryTexture *      gdk_memory_texture_from_texture     (GdkTexture        *texture,
+                                                             GdkMemoryFormat    format);
 GdkTexture *            gdk_memory_texture_new_subtexture   (GdkMemoryTexture  *texture,
                                                              int                x,
                                                              int                y,

gdk/gdkmonitor.c

@@ -744,11 +744,3 @@ gdk_monitor_set_description (GdkMonitor *monitor,
   g_object_notify_by_pspec (G_OBJECT (monitor), props[PROP_DESCRIPTION]);
 }
 
-#define MM_PER_INCH 25.4
-
-double
-gdk_monitor_get_dpi (GdkMonitor *monitor)
-{
-  return MAX ((monitor->geometry.width * monitor->scale) / (monitor->width_mm / MM_PER_INCH),
-              (monitor->geometry.height * monitor->scale) / (monitor->height_mm / MM_PER_INCH));
-}

gdk/gdkmonitorprivate.h

@@ -76,7 +76,6 @@ void            gdk_monitor_set_subpixel_layout (GdkMonitor        *monitor,
 void            gdk_monitor_invalidate          (GdkMonitor *monitor);
 void            gdk_monitor_set_description     (GdkMonitor *monitor,
                                                  const char *description);
-double          gdk_monitor_get_dpi             (GdkMonitor *monitor);
 
 G_END_DECLS
 

gdk/gdkpopup.c

@@ -109,7 +109,7 @@ gdk_popup_default_init (GdkPopupInterface *iface)
  *
  * Present @popup after having processed the `GdkPopupLayout` rules.
  *
- * If the popup was previously not showing, it will be shown,
+ * If the popup was previously now showing, it will be showed,
  * otherwise it will change position according to @layout.
  *
  * After calling this function, the result should be handled in response

gdk/gdkrgba.c

@@ -98,9 +98,9 @@ gdk_rgba_free (GdkRGBA *rgba)
  * Returns: %TRUE if the @rgba is clear
  */
 gboolean
-(gdk_rgba_is_clear) (const GdkRGBA *rgba)
+gdk_rgba_is_clear (const GdkRGBA *rgba)
 {
-  return _gdk_rgba_is_clear (rgba);
+  return rgba->alpha < ((float) 0x00ff / (float) 0xffff);
 }
 
 /**
@@ -115,9 +115,9 @@ gboolean
  * Returns: %TRUE if the @rgba is opaque
  */
 gboolean
-(gdk_rgba_is_opaque) (const GdkRGBA *rgba)
+gdk_rgba_is_opaque (const GdkRGBA *rgba)
 {
-  return _gdk_rgba_is_opaque (rgba);
+  return rgba->alpha > ((float)0xff00 / (float)0xffff);
 }
 
 #define SKIP_WHITESPACES(s) while (*(s) == ' ') (s)++;
@@ -368,10 +368,21 @@ gdk_rgba_hash (gconstpointer p)
  * Returns: %TRUE if the two colors compare equal
  */
 gboolean
-(gdk_rgba_equal) (gconstpointer p1,
-                  gconstpointer p2)
+gdk_rgba_equal (gconstpointer p1,
+                gconstpointer p2)
 {
-  return _gdk_rgba_equal (p1, p2);
+  const GdkRGBA *rgba1, *rgba2;
+
+  rgba1 = p1;
+  rgba2 = p2;
+
+  if (rgba1->red == rgba2->red &&
+      rgba1->green == rgba2->green &&
+      rgba1->blue == rgba2->blue &&
+      rgba1->alpha == rgba2->alpha)
+    return TRUE;
+
+  return FALSE;
 }
 
 /**
@@ -396,18 +407,10 @@ gboolean
  */
 char *
 gdk_rgba_to_string (const GdkRGBA *rgba)
-{
-  return g_string_free (gdk_rgba_print (rgba, g_string_new ("")), FALSE);
-}
-
-GString *
-gdk_rgba_print (const GdkRGBA *rgba,
-                GString       *string)
 {
   if (rgba->alpha > 0.999)
     {
-      g_string_append_printf (string,
-                              "rgb(%d,%d,%d)",
+      return g_strdup_printf ("rgb(%d,%d,%d)",
                               (int)(0.5 + CLAMP (rgba->red, 0., 1.) * 255.),
                               (int)(0.5 + CLAMP (rgba->green, 0., 1.) * 255.),
                               (int)(0.5 + CLAMP (rgba->blue, 0., 1.) * 255.));
@@ -418,15 +421,12 @@ gdk_rgba_print (const GdkRGBA *rgba,
 
       g_ascii_formatd (alpha, G_ASCII_DTOSTR_BUF_SIZE, "%g", CLAMP (rgba->alpha, 0, 1));
 
-      g_string_append_printf (string,
-                              "rgba(%d,%d,%d,%s)",
+      return g_strdup_printf ("rgba(%d,%d,%d,%s)",
                               (int)(0.5 + CLAMP (rgba->red, 0., 1.) * 255.),
                               (int)(0.5 + CLAMP (rgba->green, 0., 1.) * 255.),
                               (int)(0.5 + CLAMP (rgba->blue, 0., 1.) * 255.),
                               alpha);
     }
-
-  return string;
 }
 
 static gboolean

gdk/gdkrgbaprivate.h

@@ -43,37 +43,5 @@
 gboolean               gdk_rgba_parser_parse                    (GtkCssParser           *parser,
                                                                  GdkRGBA                *rgba);
 
-#define gdk_rgba_is_clear(rgba) _gdk_rgba_is_clear (rgba)
-#define gdk_rgba_is_opaque(rgba) _gdk_rgba_is_opaque (rgba)
-#define gdk_rgba_equal(p1, p2) _gdk_rgba_equal (p1, p2)
-
-static inline gboolean
-_gdk_rgba_is_clear (const GdkRGBA *rgba)
-{
-  return rgba->alpha < ((float) 0x00ff / (float) 0xffff);
-}
-
-static inline gboolean
-_gdk_rgba_is_opaque (const GdkRGBA *rgba)
-{
-  return rgba->alpha > ((float)0xff00 / (float)0xffff);
-}
-
-static inline gboolean
-_gdk_rgba_equal (gconstpointer p1,
-                 gconstpointer p2)
-{
-  const GdkRGBA *rgba1 = p1;
-  const GdkRGBA *rgba2 = p2;
-
-  return rgba1->red == rgba2->red &&
-         rgba1->green == rgba2->green &&
-         rgba1->blue == rgba2->blue &&
-         rgba1->alpha == rgba2->alpha;
-}
-
-GString * gdk_rgba_print (const GdkRGBA *rgba,
-                          GString       *string);
-
 G_END_DECLS
 

gdk/gdksubsurface.c

@@ -48,14 +48,6 @@ gdk_subsurface_class_init (GdkSubsurfaceClass *class)
   object_class->finalize = gdk_subsurface_finalize;
 }
 
-/*< private >
- * gdk_subsurface_get_parent:
- * @subsurface: a `GdkSubsurface`
- *
- * Returns the parent surface of @subsurface.
- *
- * Returns: the parent surface
- */
 GdkSurface *
 gdk_subsurface_get_parent (GdkSubsurface *subsurface)
 {
@@ -116,41 +108,15 @@ insert_subsurface (GdkSubsurface *subsurface,
     }
 }
 
-/*< private >
- * gdk_subsurface_attach:
- * @subsurface: the `GdkSubsurface`
- * @texture: the texture to attach. This typically has to be a `GdkDmabufTexture`
- * @source: the source rectangle (i.e. the subset of the texture) to display
- * @dest: the dest rectangle, in application pixels, relative to the parent surface.
- *   It must be integral in application and device pixels, or attaching will fail
- * @transform: the transform to apply to the texture contents before displaying
- * @background: (nullable): the background rectangle, in application pixels relative
- *   to the parent surface. This tells GDK to put a black background of this
- *   size below the subsurface. It must be integral in application and device pixels,
- *   or attaching will fail
- * @above: whether the subsurface should be above its sibling
- * @sibling: (nullable): the sibling subsurface to stack relative to, or `NULL` to
- *   stack relative to the parent surface
- *
- * Attaches content to a subsurface.
- *
- * This function takes all the necessary arguments to determine the subsurface
- * configuration, including its position, size, content, background and stacking.
- *
- * Returns: `TRUE` if the attaching succeeded
- */
 gboolean
 gdk_subsurface_attach (GdkSubsurface         *subsurface,
                        GdkTexture            *texture,
                        const graphene_rect_t *source,
                        const graphene_rect_t *dest,
-                       GdkTextureTransform    transform,
-                       const graphene_rect_t *background,
                        gboolean               above,
                        GdkSubsurface         *sibling)
 {
   GdkSurface *parent = subsurface->parent;
-  gboolean result;
 
   g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);
   g_return_val_if_fail (GDK_IS_TEXTURE (texture), FALSE);
@@ -164,15 +130,6 @@ gdk_subsurface_attach (GdkSubsurface         *subsurface,
   g_return_val_if_fail (sibling == NULL || GDK_IS_SUBSURFACE (sibling), FALSE);
   g_return_val_if_fail (sibling == NULL || sibling->parent == subsurface->parent, FALSE);
 
-  result = GDK_SUBSURFACE_GET_CLASS (subsurface)->attach (subsurface,
-                                                          texture,
-                                                          source,
-                                                          dest,
-                                                          transform,
-                                                          background,
-                                                          above,
-                                                          sibling);
-
   remove_subsurface (subsurface);
 
   if (sibling)
@@ -198,17 +155,9 @@ gdk_subsurface_attach (GdkSubsurface         *subsurface,
         }
     }
 
-  return result;
+  return GDK_SUBSURFACE_GET_CLASS (subsurface)->attach (subsurface, texture, source, dest, above, sibling);
 }
 
-/*< private >
- * gdk_subsurface_detach:
- * @subsurface: a `GdkSubsurface`
- *
- * Hides the subsurface.
- *
- * To show it again, you need to call gdk_subsurface_attach().
- */
 void
 gdk_subsurface_detach (GdkSubsurface *subsurface)
 {
@@ -219,14 +168,6 @@ gdk_subsurface_detach (GdkSubsurface *subsurface)
   GDK_SUBSURFACE_GET_CLASS (subsurface)->detach (subsurface);
 }
 
-/*< private >
- * gdk_subsurface_get_texture:
- * @subsurface: a `GdkSubsurface`
- *
- * Gets the texture that is currently displayed by the subsurface.
- *
- * Returns: (nullable): the texture that is displayed
- */
 GdkTexture *
 gdk_subsurface_get_texture (GdkSubsurface *subsurface)
 {
@@ -235,138 +176,30 @@ gdk_subsurface_get_texture (GdkSubsurface *subsurface)
   return GDK_SUBSURFACE_GET_CLASS (subsurface)->get_texture (subsurface);
 }
 
-/*< private >
- * gdk_subsurface_get_source_rect:
- * @subsurface: a `GdkSubsurface`
- * @rect: (out caller-allocates): return location for the rectangle
- *
- * Returns the source rect that was specified in the most recent
- * gdk_subsurface_attach() call for @subsurface.
- */
 void
-gdk_subsurface_get_source_rect (GdkSubsurface   *subsurface,
-                                graphene_rect_t *rect)
+gdk_subsurface_get_source (GdkSubsurface   *subsurface,
+                           graphene_rect_t *source)
 {
   g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (rect != NULL);
+  g_return_if_fail (source != NULL);
 
-  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_source_rect (subsurface, rect);
+  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_source (subsurface, source);
 }
 
-/*< private >
- * gdk_subsurface_get_texture_rect:
- * @subsurface: a `GdkSubsurface`
- * @rect: (out caller-allocates): return location for the rectangle
- *
- * Returns the texture rect that was specified in the most recent
- * gdk_subsurface_attach() call for @subsurface.
- */
 void
-gdk_subsurface_get_texture_rect (GdkSubsurface   *subsurface,
-                                 graphene_rect_t *rect)
+gdk_subsurface_get_dest (GdkSubsurface   *subsurface,
+                         graphene_rect_t *dest)
 {
   g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (rect != NULL);
+  g_return_if_fail (dest != NULL);
 
-  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_texture_rect (subsurface, rect);
+  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_dest (subsurface, dest);
 }
 
-/*< private >
- * gdk_subsurface_is_above_parent:
- * @subsurface: a `GdkSubsurface`
- *
- * Returns whether the subsurface is above the parent surface
- * or below. Note that a subsurface can be above its parent
- * surface, and still be covered by sibling subsurfaces.
- *
- * Returns: `TRUE` if @subsurface is above its parent
- */
 gboolean
 gdk_subsurface_is_above_parent (GdkSubsurface *subsurface)
 {
-  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);
+  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), TRUE);
 
   return subsurface->above_parent;
 }
-
-/*< private>
- * gdk_subsurface_get_sibling:
- * @subsurface: the `GdkSubsurface`
- * @above: whether to get the subsurface above
- *
- * Returns the subsurface above (or below) @subsurface in
- * the stacking order.
- *
- * Returns: the sibling, or `NULL` if there is none.
- */
-GdkSubsurface *
-gdk_subsurface_get_sibling (GdkSubsurface *subsurface,
-                            gboolean       above)
-{
-  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), NULL);
-
-  if (above)
-    return subsurface->sibling_above;
-  else
-    return subsurface->sibling_below;
-}
-
-/*< private >
- * gdk_subsurface_get_transform:
- * @subsurface: a `GdkSubsurface`
- *
- * Returns the transform that was specified in the most recent call to
- * gdk_subsurface_attach() call for @subsurface.
- *
- * Returns: the transform
- */
-GdkTextureTransform
-gdk_subsurface_get_transform (GdkSubsurface *subsurface)
-{
-  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), GDK_TEXTURE_TRANSFORM_NORMAL);
-
-  return GDK_SUBSURFACE_GET_CLASS (subsurface)->get_transform (subsurface);
-}
-
-/*< private >
- * gdk_subsurface_get_background_rect:
- * @subsurface: a `GdkSubsurface`
- * @rect: (out caller-allocates): return location for the rectangle
- *
- * Obtains the background rect that was specified in the most recent
- * gdk_subsurface_attach() call for @subsurface.
- *
- * Returns: `TRUE` if @subsurface has a background
- */
-gboolean
-gdk_subsurface_get_background_rect (GdkSubsurface   *subsurface,
-                                    graphene_rect_t *rect)
-{
-  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);
-  g_return_val_if_fail (rect != NULL, FALSE);
-
-  return GDK_SUBSURFACE_GET_CLASS (subsurface)->get_background_rect (subsurface, rect);
-}
-
-/*< private >
- * gdk_subsurface_get_bounds:
- * @subsurface: a `GdkSubsurface`
- * @bounds: (out caller-allocates): return location for the bounds
- *
- * Returns the bounds of the subsurface.
- *
- * The bounds are the union of the texture and background rects.
- */
-void
-gdk_subsurface_get_bounds (GdkSubsurface   *subsurface,
-                           graphene_rect_t *bounds)
-{
-  graphene_rect_t background;
-
-  g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (bounds != NULL);
-
-  gdk_subsurface_get_texture_rect (subsurface, bounds);
-  if (gdk_subsurface_get_background_rect (subsurface, &background))
-    graphene_rect_union (bounds, &background, bounds);
-}

gdk/gdksubsurfaceprivate.h

@@ -47,68 +47,42 @@ struct _GdkSubsurface
   GdkSubsurface *sibling_below;
 };
 
-typedef enum {
-  GDK_TEXTURE_TRANSFORM_NORMAL,
-  GDK_TEXTURE_TRANSFORM_90,
-  GDK_TEXTURE_TRANSFORM_180,
-  GDK_TEXTURE_TRANSFORM_270,
-  GDK_TEXTURE_TRANSFORM_FLIPPED,
-  GDK_TEXTURE_TRANSFORM_FLIPPED_90,
-  GDK_TEXTURE_TRANSFORM_FLIPPED_180,
-  GDK_TEXTURE_TRANSFORM_FLIPPED_270,
-} GdkTextureTransform;
 
 struct _GdkSubsurfaceClass
 {
   GObjectClass parent_class;
 
-  gboolean     (* attach)              (GdkSubsurface         *subsurface,
-                                        GdkTexture            *texture,
-                                        const graphene_rect_t *source,
-                                        const graphene_rect_t *dest,
-                                        GdkTextureTransform    transform,
-                                        const graphene_rect_t *bg,
-                                        gboolean               above,
-                                        GdkSubsurface         *sibling);
-  void         (* detach)              (GdkSubsurface         *subsurface);
-  GdkTexture * (* get_texture)         (GdkSubsurface         *subsurface);
-  void         (* get_source_rect)     (GdkSubsurface         *subsurface,
-                                        graphene_rect_t       *rect);
-  void         (* get_texture_rect)    (GdkSubsurface         *subsurface,
-                                        graphene_rect_t       *rect);
-  GdkTextureTransform
-               (* get_transform)       (GdkSubsurface         *subsurface);
-  gboolean     (* get_background_rect) (GdkSubsurface         *subsurface,
-                                        graphene_rect_t       *rect);
+  gboolean     (* attach)          (GdkSubsurface         *subsurface,
+                                    GdkTexture            *texture,
+                                    const graphene_rect_t *source,
+                                    const graphene_rect_t *dest,
+                                    gboolean               above,
+                                    GdkSubsurface         *sibling);
+  void         (* detach)          (GdkSubsurface         *subsurface);
+  GdkTexture * (* get_texture)     (GdkSubsurface         *subsurface);
+  void         (* get_source)      (GdkSubsurface         *subsurface,
+                                    graphene_rect_t       *source);
+  void         (* get_dest)        (GdkSubsurface         *subsurface,
+                                    graphene_rect_t       *dest);
 };
 
-GType           gdk_subsurface_get_type            (void) G_GNUC_CONST;
+GType           gdk_subsurface_get_type        (void) G_GNUC_CONST;
 
-GdkSurface *    gdk_subsurface_get_parent          (GdkSubsurface         *subsurface);
+GdkSurface *    gdk_subsurface_get_parent      (GdkSubsurface         *subsurface);
+gboolean        gdk_subsurface_attach          (GdkSubsurface         *subsurface,
+                                                GdkTexture            *texture,
+                                                const graphene_rect_t *source,
+                                                const graphene_rect_t *dest,
+                                                gboolean               above,
+                                                GdkSubsurface         *sibling);
+void            gdk_subsurface_detach          (GdkSubsurface         *subsurface);
+GdkTexture *    gdk_subsurface_get_texture     (GdkSubsurface         *subsurface);
+void            gdk_subsurface_get_source      (GdkSubsurface         *subsurface,
+                                                graphene_rect_t       *source);
+void            gdk_subsurface_get_dest        (GdkSubsurface         *subsurface,
+                                               graphene_rect_t       *dest);
+gboolean        gdk_subsurface_is_above_parent (GdkSubsurface         *subsurface);
 
-gboolean        gdk_subsurface_attach              (GdkSubsurface         *subsurface,
-                                                    GdkTexture            *texture,
-                                                    const graphene_rect_t *source,
-                                                    const graphene_rect_t *dest,
-                                                    GdkTextureTransform    transform,
-                                                    const graphene_rect_t *background,
-                                                    gboolean               above,
-                                                    GdkSubsurface         *sibling);
-void            gdk_subsurface_detach              (GdkSubsurface         *subsurface);
-GdkTexture *    gdk_subsurface_get_texture         (GdkSubsurface         *subsurface);
-void            gdk_subsurface_get_source_rect     (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *rect);
-void            gdk_subsurface_get_texture_rect    (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *rect);
-gboolean        gdk_subsurface_is_above_parent     (GdkSubsurface         *subsurface);
-GdkSubsurface * gdk_subsurface_get_sibling         (GdkSubsurface         *subsurface,
-                                                    gboolean               above);
-GdkTextureTransform
-                gdk_subsurface_get_transform       (GdkSubsurface         *subsurface);
-gboolean        gdk_subsurface_get_background_rect (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *rect);
-void            gdk_subsurface_get_bounds          (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *bounds);
 
 G_END_DECLS
 

gdk/gdktexture.c

@@ -50,13 +50,6 @@
 #include "loaders/gdktiffprivate.h"
 #include "loaders/gdkjpegprivate.h"
 
-/**
- * gdk_texture_error_quark:
- *
- * Registers an error quark for [class@Gdk.Texture] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-texture-error-quark, gdk_texture_error)
 
 /* HACK: So we don't need to include any (not-yet-created) GSK or GTK headers */

gdk/gdktoplevel.c

@@ -745,10 +745,6 @@ gdk_toplevel_begin_move (GdkToplevel *toplevel,
  * @toplevel: a `GdkToplevel`
  * @gesture: a `GdkTitlebarGesture`
  *
- * Performs a title bar gesture.
- *
- * Returns: whether the gesture was performed
- *
  * Since: 4.4
  */
 gboolean
@@ -771,6 +767,9 @@ gdk_toplevel_titlebar_gesture (GdkToplevel        *toplevel,
  * This function asynchronously obtains a handle for a toplevel surface
  * that can be passed to other processes.
  *
+ * When a handle has been obtained, @callback will be called, and can
+ * receive the handle via [method@Gdk.Toplevel.export_handle_finish].
+ *
  * It is an error to call this function on a surface that is already
  * exported.
  *

gdk/gdktoplevel.h

@@ -118,12 +118,9 @@ typedef enum
 
 /**
  * GdkTitlebarGesture:
- * @GDK_TITLEBAR_GESTURE_DOUBLE_CLICK: double click gesture
- * @GDK_TITLEBAR_GESTURE_RIGHT_CLICK: right click gesture
- * @GDK_TITLEBAR_GESTURE_MIDDLE_CLICK: middle click gesture
- *
- * The kind of title bar gesture to emit with
- * [method@Gdk.Toplevel.titlebar_gesture].
+ * @GDK_TITLEBAR_GESTURE_DOUBLE_CLICK:
+ * @GDK_TITLEBAR_GESTURE_RIGHT_CLICK:
+ * @GDK_TITLEBAR_GESTURE_MIDDLE_CLICK:
  *
  * Since: 4.4
  */

gdk/gdktypes.h

@@ -99,7 +99,7 @@ typedef struct _GdkVulkanContext      GdkVulkanContext;
 typedef struct _GdkDmabufFormats      GdkDmabufFormats;
 typedef struct _GdkDmabufTexture      GdkDmabufTexture;
 
-/*<private>
+/*
  * GDK_DECLARE_INTERNAL_TYPE:
  * @ModuleObjName: The name of the new type, in camel case (like GtkWidget)
  * @module_obj_name: The name of the new type in lowercase, with words

gdk/gdkvulkancontext.c

@@ -29,8 +29,6 @@
 #include "gdkdmabuffourccprivate.h"
 #include "gdkdmabuftextureprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkprofilerprivate.h"
-#include "gdkmemorytexture.h"
 #include <glib/gi18n-lib.h>
 #include <math.h>
 
@@ -59,9 +57,6 @@ static const GdkDebugKey gsk_vulkan_feature_keys[] = {
  *
  * Support for `GdkVulkanContext` is platform-specific and context creation
  * can fail, returning %NULL context.
- *
- * Deprecated: 4.14: GTK does not expose any Vulkan internals. This
- *   struct is a leftover that was accidentally exposed.
  */
 
 typedef struct _GdkVulkanContextPrivate GdkVulkanContextPrivate;
@@ -73,7 +68,8 @@ struct _GdkVulkanContextPrivate {
     VkSurfaceFormatKHR vk_format;
     GdkMemoryFormat gdk_format;
   } formats[4];
-  GdkMemoryDepth current_depth;
+  GdkMemoryDepth current_format;
+  GdkMemoryFormat offscreen_formats[4];
 
   VkSwapchainKHR swapchain;
   VkSemaphore draw_semaphore;
@@ -94,13 +90,6 @@ enum {
   LAST_SIGNAL
 };
 
-/**
- * gdk_vulkan_error_quark:
- *
- * Registers an error quark for [class@Gdk.VulkanContext] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-vulkan-error-quark, gdk_vulkan_error)
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -473,8 +462,8 @@ gdk_vulkan_context_check_swapchain (GdkVulkanContext  *context,
                                                 .minImageCount = CLAMP (4,
                                                                         capabilities.minImageCount,
                                                                         capabilities.maxImageCount ? capabilities.maxImageCount : G_MAXUINT32),
-                                                .imageFormat = priv->formats[priv->current_depth].vk_format.format,
-                                                .imageColorSpace = priv->formats[priv->current_depth].vk_format.colorSpace,
+                                                .imageFormat = priv->formats[priv->current_format].vk_format.format,
+                                                .imageColorSpace = priv->formats[priv->current_format].vk_format.colorSpace,
                                                 .imageExtent = capabilities.currentExtent,
                                                 .imageArrayLayers = 1,
                                                 .imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
@@ -614,8 +603,7 @@ physical_device_check_features (VkPhysicalDevice device)
     features |= GDK_VULKAN_FEATURE_YCBCR;
 
   if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME) &&
-      physical_device_supports_extension (device, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME) &&
-      physical_device_supports_extension (device, VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME))
+      physical_device_supports_extension (device, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME))
     features |= GDK_VULKAN_FEATURE_DMABUF;
 
   if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME))
@@ -640,54 +628,33 @@ gdk_vulkan_context_begin_frame (GdkDrawContext *draw_context,
 {
   GdkVulkanContext *context = GDK_VULKAN_CONTEXT (draw_context);
   GdkVulkanContextPrivate *priv = gdk_vulkan_context_get_instance_private (context);
-  VkResult acquire_result;
   guint i;
 
-  if (depth != priv->current_depth)
+  if (depth != priv->current_format)
     {
-      if (priv->formats[depth].gdk_format != priv->formats[priv->current_depth].gdk_format)
+      if (priv->formats[depth].gdk_format != priv->formats[priv->current_format].gdk_format)
         {
-          GdkMemoryDepth old_depth = priv->current_depth;
           GError *error = NULL;
-
-          priv->current_depth = depth;
           if (!gdk_vulkan_context_check_swapchain (context, &error))
             {
               g_warning ("%s", error->message);
               g_error_free (error);
-              priv->current_depth = old_depth;
               return;
             }
         }
+      priv->current_format = depth;
     }
   for (i = 0; i < priv->n_images; i++)
     {
       cairo_region_union (priv->regions[i], region);
     }
 
-acquire_next_image:
-  acquire_result = GDK_VK_CHECK (vkAcquireNextImageKHR, gdk_vulkan_context_get_device (context),
-                                                        priv->swapchain,
-                                                        UINT64_MAX,
-                                                        priv->draw_semaphore,
-                                                        VK_NULL_HANDLE,
-                                                        &priv->draw_index);
-  if ((acquire_result == VK_ERROR_OUT_OF_DATE_KHR) ||
-      (acquire_result == VK_SUBOPTIMAL_KHR))
-    {
-      GError *error = NULL;
-
-      GDK_DEBUG (VULKAN, "Recreating the swapchain");
-
-      if (!gdk_vulkan_context_check_swapchain (context, &error))
-        {
-          g_warning ("%s", error->message);
-          g_error_free (error);
-          return;
-        }
-
-       goto acquire_next_image;
-     }
+  GDK_VK_CHECK (vkAcquireNextImageKHR, gdk_vulkan_context_get_device (context),
+                                       priv->swapchain,
+                                       UINT64_MAX,
+                                       priv->draw_semaphore,
+                                       VK_NULL_HANDLE,
+                                       &priv->draw_index);
 
   cairo_region_union (region, priv->regions[priv->draw_index]);
 }
@@ -827,6 +794,11 @@ gdk_vulkan_context_real_init (GInitable     *initable,
   if (!priv->vulkan_ref)
     return FALSE;
 
+  priv->offscreen_formats[GDK_MEMORY_U8] = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
+  priv->offscreen_formats[GDK_MEMORY_U16] = GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
+  priv->offscreen_formats[GDK_MEMORY_FLOAT16] = GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED;
+  priv->offscreen_formats[GDK_MEMORY_FLOAT32] = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
+
   if (surface == NULL)
     {
       for (i = 0; i < G_N_ELEMENTS (priv->formats); i++)
@@ -882,6 +854,7 @@ gdk_vulkan_context_real_init (GInitable     *initable,
                   {
                     priv->formats[GDK_MEMORY_U8].vk_format = formats[i];
                     priv->formats[GDK_MEMORY_U8].gdk_format = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
+                    priv->offscreen_formats[GDK_MEMORY_U8] = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
                   };
                 break;
 
@@ -958,6 +931,15 @@ out_surface:
   return FALSE;
 }
 
+GdkMemoryFormat
+gdk_vulkan_context_get_offscreen_format (GdkVulkanContext *context,
+                                         GdkMemoryDepth    depth)
+{
+  GdkVulkanContextPrivate *priv = gdk_vulkan_context_get_instance_private (context);
+
+  return priv->offscreen_formats[depth];
+}
+
 static void
 gdk_vulkan_context_initable_init (GInitableIface *iface)
 {
@@ -1125,7 +1107,6 @@ gdk_display_load_pipeline_cache (GdkDisplay *display)
 static gboolean
 gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
 {
-  G_GNUC_UNUSED gint64 begin_time = GDK_PROFILER_CURRENT_TIME;
   GError *error = NULL;
   VkDevice device;
   VkPipelineCache cache;
@@ -1140,13 +1121,14 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
   GDK_VK_CHECK (vkGetPipelineCacheData, device, cache, &size, NULL);
   if (size == 0)
     return TRUE;
-
+  
   if (size == display->vk_pipeline_cache_size)
     {
       GDK_DEBUG (VULKAN, "pipeline cache size (%zu bytes) unchanged, skipping save", size);
       return TRUE;
     }
 
+
   data = g_malloc (size);
   if (GDK_VK_CHECK (vkGetPipelineCacheData, device, cache, &size, data) != VK_SUCCESS)
     {
@@ -1166,7 +1148,7 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
 
   file = gdk_vulkan_get_pipeline_cache_file (display);
 
-  GDK_DEBUG (VULKAN, "Saving pipeline cache of size %lu to %s", size, g_file_peek_path (file));
+  GDK_DEBUG (VULKAN, "Saving pipeline cache to %s", g_file_peek_path (file));
 
   if (!g_file_replace_contents (file,
                                 data,
@@ -1181,7 +1163,7 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
       if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WRONG_ETAG))
         {
           VkPipelineCache new_cache;
-
+          
           GDK_DEBUG (VULKAN, "Pipeline cache file modified, merging into current");
           new_cache = gdk_display_load_pipeline_cache (display);
           if (new_cache)
@@ -1208,10 +1190,6 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
       return FALSE;
     }
 
-  gdk_profiler_end_markf (begin_time,
-                          "Save Vulkan pipeline cache", "%s size %lu",
-                          g_file_peek_path (file), size);
-
   g_object_unref (file);
   g_free (data);
   g_free (display->vk_pipeline_cache_etag);
@@ -1256,11 +1234,6 @@ gdk_display_create_pipeline_cache (GdkDisplay *display)
                                            },
                                            NULL,
                                            &display->vk_pipeline_cache);
-      GDK_DEBUG (VULKAN, "Creating empty pipeline cache");
-    }
-  else
-    {
-      GDK_DEBUG (VULKAN, "Loading pipeline cache (%lu bytes)", display->vk_pipeline_cache_size);
     }
 }
 
@@ -1279,18 +1252,9 @@ gdk_vulkan_context_get_image_format (GdkVulkanContext *context)
 
   g_return_val_if_fail (GDK_IS_VULKAN_CONTEXT (context), VK_FORMAT_UNDEFINED);
 
-  return priv->formats[priv->current_depth].vk_format.format;
+  return priv->formats[priv->current_format].vk_format.format;
 }
 
-GdkMemoryFormat
-gdk_vulkan_context_get_memory_format (GdkVulkanContext *context)
-{
-  GdkVulkanContextPrivate *priv = gdk_vulkan_context_get_instance_private (context);
-
-  g_return_val_if_fail (GDK_IS_VULKAN_CONTEXT (context), GDK_MEMORY_DEFAULT);
-
-  return priv->formats[priv->current_depth].gdk_format;
-}
 /**
  * gdk_vulkan_context_get_n_images:
  * @context: a `GdkVulkanContext`
@@ -1379,7 +1343,6 @@ static gboolean
 gdk_display_create_vulkan_device (GdkDisplay  *display,
                                   GError     **error)
 {
-  G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
   uint32_t i, j, k;
   const char *override;
   gboolean list_devices;
@@ -1522,7 +1485,6 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
 
                   g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME);
                   g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
-                  g_ptr_array_add (device_extensions, (gpointer) VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME);
 
                   g_ptr_array_add (device_extensions, (gpointer) VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME);
                   g_ptr_array_add (device_extensions, (gpointer) VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME);
@@ -1589,8 +1551,6 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
                                        "Hum, what? This should not happen.")));
                 }
 
-              gdk_profiler_end_mark (start_time, "Create Vulkan device", NULL);
-
               return TRUE;
             }
         }
@@ -1629,7 +1589,6 @@ static gboolean
 gdk_display_create_vulkan_instance (GdkDisplay  *display,
                                     GError     **error)
 {
-  G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
   uint32_t i;
   GPtrArray *used_extensions;
   GPtrArray *used_layers;
@@ -1791,8 +1750,6 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
 
   display->vk_shader_modules = g_hash_table_new (g_str_hash, g_str_equal);
 
-  gdk_profiler_end_mark (start_time, "Create Vulkan instance", NULL);
-
   return TRUE;
 }
 
@@ -1863,9 +1820,8 @@ gdk_display_unref_vulkan (GdkDisplay *display)
     {
       g_free (key);
       vkDestroyShaderModule (display->vk_device,
-                             *((VkShaderModule *)value),
+                             value,
                              NULL);
-      g_free (value);
     }
   g_hash_table_unref (display->vk_shader_modules);
 
@@ -1993,13 +1949,13 @@ VkShaderModule
 gdk_display_get_vk_shader_module (GdkDisplay *self,
                                   const char *resource_name)
 {
-  VkShaderModule *shader;
+  VkShaderModule shader;
   GError *error = NULL;
   GBytes *bytes;
 
   shader = g_hash_table_lookup (self->vk_shader_modules, resource_name);
   if (shader)
-    return *shader;
+    return shader;
 
   bytes = g_resources_lookup_data (resource_name, 0, &error);
   if (bytes == NULL)
@@ -2009,7 +1965,6 @@ gdk_display_get_vk_shader_module (GdkDisplay *self,
       return VK_NULL_HANDLE;
     }
 
-  shader = g_new0 (VkShaderModule, 1);
   if (GDK_VK_CHECK (vkCreateShaderModule, self->vk_device,
                                           &(VkShaderModuleCreateInfo) {
                                               .sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
@@ -2017,20 +1972,18 @@ gdk_display_get_vk_shader_module (GdkDisplay *self,
                                               .pCode = (uint32_t *) g_bytes_get_data (bytes, NULL),
                                           },
                                           NULL,
-                                          shader) == VK_SUCCESS)
+                                          &shader) == VK_SUCCESS)
     {
       g_hash_table_insert (self->vk_shader_modules, g_strdup (resource_name), shader);
     }
   else
     {
-      g_free (shader);
-
-      return VK_NULL_HANDLE;
+      shader = VK_NULL_HANDLE;
     }
 
   g_bytes_unref (bytes);
 
-  return *shader;
+  return shader;
 }
 
 #else /* GDK_RENDERING_VULKAN */

gdk/gdkvulkancontextprivate.h

@@ -94,13 +94,15 @@ VkDevice                gdk_vulkan_context_get_device                   (GdkVulk
 VkQueue                 gdk_vulkan_context_get_queue                    (GdkVulkanContext      *context);
 uint32_t                gdk_vulkan_context_get_queue_family_index       (GdkVulkanContext      *context);
 VkFormat                gdk_vulkan_context_get_image_format             (GdkVulkanContext      *context);
-GdkMemoryFormat         gdk_vulkan_context_get_memory_format            (GdkVulkanContext      *context);
 uint32_t                gdk_vulkan_context_get_n_images                 (GdkVulkanContext      *context);
 VkImage                 gdk_vulkan_context_get_image                    (GdkVulkanContext      *context,
                                                                          guint                  id);
 uint32_t                gdk_vulkan_context_get_draw_index               (GdkVulkanContext      *context);
 VkSemaphore             gdk_vulkan_context_get_draw_semaphore           (GdkVulkanContext      *context);
 
+GdkMemoryFormat         gdk_vulkan_context_get_offscreen_format         (GdkVulkanContext      *context,
+                                                                         GdkMemoryDepth         depth);
+
 #else /* !GDK_RENDERING_VULKAN */
 
 

gdk/macos/gdkmacoscursor.c

@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "gdkmacoscursor-private.h"
-#include "gdkcursorprivate.h"
 
 @interface NSCursor()
 -(long long)_coreCursorType;
@@ -218,25 +217,9 @@ _gdk_macos_cursor_get_ns_cursor (GdkCursor *cursor)
 
       if (name == NULL)
         {
-          GdkTexture *texture;
-          int hotspot_x, hotspot_y;
-
-          texture = gdk_cursor_get_texture (cursor);
-          hotspot_x = gdk_cursor_get_hotspot_x (cursor);
-          hotspot_y = gdk_cursor_get_hotspot_y (cursor);
-
-          if (texture == NULL)
-            {
-              int size = 32; // FIXME
-              int width, height;
-
-              texture = gdk_cursor_get_texture_for_size (cursor, size, 1,
-                                                         &width, &height,
-                                                         &hotspot_x, &hotspot_y);
-            }
-
-          nscursor = create_cursor_from_texture (texture, hotspot_x, hotspot_y);
-
+          nscursor = create_cursor_from_texture (gdk_cursor_get_texture (cursor),
+                                                 gdk_cursor_get_hotspot_x (cursor),
+                                                 gdk_cursor_get_hotspot_y (cursor));
           return nscursor;
         }
     }

gdk/macos/gdkmacosdisplay-private.h

@@ -176,7 +176,6 @@ void             _gdk_macos_display_set_drop                       (GdkMacosDisp
                                                                     GdkDrop         *drop);
 void             _gdk_macos_display_position_surface               (GdkMacosDisplay *self,
                                                                     GdkMacosSurface *surface,
-                                                                    GdkMonitor      *monitor,
                                                                     int             *x,
                                                                     int             *y);
 

gdk/macos/gdkmacosdisplay-translate.c

@@ -32,6 +32,7 @@
 
 #include "gdk/gdkeventsprivate.h"
 
+#define GDK_MOD2_MASK (1 << 4)
 #define GRIP_WIDTH 15
 #define GRIP_HEIGHT 15
 #define GDK_LION_RESIZE 5
@@ -174,7 +175,7 @@ get_keyboard_modifiers_from_ns_flags (NSUInteger nsflags)
   if (nsflags & NSEventModifierFlagOption)
     modifiers |= GDK_ALT_MASK;
   if (nsflags & NSEventModifierFlagCommand)
-    modifiers |= GDK_META_MASK;
+    modifiers |= GDK_MOD2_MASK;
 
   return modifiers;
 }
@@ -313,6 +314,13 @@ get_group_from_ns_event (NSEvent *nsevent)
   return ([nsevent modifierFlags] & NSEventModifierFlagOption) ? 1 : 0;
 }
 
+static void
+add_virtual_modifiers (GdkModifierType *state)
+{
+  if (*state & GDK_MOD2_MASK)
+    *state |= GDK_META_MASK;
+}
+
 static GdkEvent *
 fill_key_event (GdkMacosDisplay *display,
                 GdkMacosSurface *surface,
@@ -359,7 +367,7 @@ fill_key_event (GdkMacosDisplay *display,
         {
         case GDK_KEY_Meta_R:
         case GDK_KEY_Meta_L:
-          mask = GDK_META_MASK;
+          mask = GDK_MOD2_MASK;
           break;
         case GDK_KEY_Shift_R:
         case GDK_KEY_Shift_L:
@@ -387,6 +395,7 @@ fill_key_event (GdkMacosDisplay *display,
     }
 
   state |= _gdk_macos_display_get_current_mouse_modifiers (display);
+  add_virtual_modifiers (&state);
 
   translated.keyval = keyval;
   translated.consumed = consumed;

gdk/macos/gdkmacosdisplay-wm.c

@@ -82,7 +82,6 @@ has_surface_at_origin (const GList *surfaces,
 static void
 _gdk_macos_display_position_toplevel (GdkMacosDisplay *self,
                                       GdkMacosSurface *surface,
-                                      GdkMonitor      *selected_monitor,
                                       int             *x,
                                       int             *y)
 {
@@ -96,11 +95,7 @@ _gdk_macos_display_position_toplevel (GdkMacosDisplay *self,
   g_assert (GDK_IS_MACOS_TOPLEVEL_SURFACE (surface));
 
   mouse = [NSEvent mouseLocation];
-  if (!selected_monitor)
-    monitor = _gdk_macos_display_get_monitor_at_display_coords (self, mouse.x, mouse.y);
-  else
-    monitor = selected_monitor;
-
+  monitor = _gdk_macos_display_get_monitor_at_display_coords (self, mouse.x, mouse.y);
   gdk_macos_monitor_get_workarea (monitor, &workarea);
 
   /* First place at top-left of current monitor */
@@ -109,7 +104,7 @@ _gdk_macos_display_position_toplevel (GdkMacosDisplay *self,
   surface_rect.x = workarea.x + ((workarea.width - surface_rect.width) / 2);
   surface_rect.y = workarea.y + ((workarea.height - surface_rect.height) / 2);
 
-  _gdk_macos_monitor_clamp (GDK_MACOS_MONITOR (selected_monitor ? selected_monitor : surface->best_monitor), &surface_rect);
+  _gdk_macos_monitor_clamp (GDK_MACOS_MONITOR (surface->best_monitor), &surface_rect);
 
   *x = surface_rect.x;
   *y = surface_rect.y;
@@ -143,7 +138,6 @@ _gdk_macos_display_position_toplevel (GdkMacosDisplay *self,
 void
 _gdk_macos_display_position_surface (GdkMacosDisplay *self,
                                      GdkMacosSurface *surface,
-                                     GdkMonitor      *monitor,
                                      int             *x,
                                      int             *y)
 {
@@ -157,5 +151,5 @@ _gdk_macos_display_position_surface (GdkMacosDisplay *self,
   if (transient_for != NULL)
     _gdk_macos_display_position_toplevel_with_parent (self, surface, GDK_MACOS_SURFACE (transient_for), x, y);
   else
-    _gdk_macos_display_position_toplevel (self, surface, monitor, x, y);
+    _gdk_macos_display_position_toplevel (self, surface, x, y);
 }

gdk/macos/gdkmacosdragsurface.c

@@ -96,12 +96,12 @@ _gdk_macos_drag_surface_constructed (GObject *object)
                                                  defer:NO
                                                 screen:screen];
 
-  _gdk_macos_surface_set_native (self, window);
-
   [window setOpaque:NO];
   [window setBackgroundColor:[NSColor clearColor]];
   [window setDecorated:NO];
 
+  _gdk_macos_surface_set_native (self, window);
+
   frame_clock = _gdk_frame_clock_idle_new ();
   gdk_surface_set_frame_clock (surface, frame_clock);
   g_object_unref (frame_clock);

gdk/macos/gdkmacospopupsurface.c

@@ -52,7 +52,6 @@ gdk_macos_popup_surface_layout (GdkMacosPopupSurface *self,
   GdkRectangle bounds;
   GdkRectangle final_rect;
   int x, y;
-  int shadow_left, shadow_right, shadow_top, shadow_bottom;
 
   g_assert (GDK_IS_MACOS_POPUP_SURFACE (self));
   g_assert (layout != NULL);
@@ -69,19 +68,10 @@ gdk_macos_popup_surface_layout (GdkMacosPopupSurface *self,
     monitor = _gdk_macos_surface_get_best_monitor (GDK_MACOS_SURFACE (self));
   gdk_macos_monitor_get_workarea (monitor, &bounds);
 
-  gdk_popup_layout_get_shadow_width (layout,
-                                     &shadow_left,
-                                     &shadow_right,
-                                     &shadow_top,
-                                     &shadow_bottom);
-
   gdk_surface_layout_popup_helper (GDK_SURFACE (self),
                                    width,
                                    height,
-                                   shadow_left,
-                                   shadow_right,
-                                   shadow_top,
-                                   shadow_bottom,
+                                   0, 0, 0, 0, /* shadow-left/right/top/bottom */
                                    monitor,
                                    &bounds,
                                    self->layout,
@@ -316,14 +306,14 @@ _gdk_macos_popup_surface_constructed (GObject *object)
                                                  defer:NO
                                                 screen:screen];
 
-  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
-
   [window setOpaque:NO];
   [window setBackgroundColor:[NSColor clearColor]];
   [window setDecorated:NO];
   [window setExcludedFromWindowsMenu:YES];
   [window setLevel:NSPopUpMenuWindowLevel];
 
+  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
+
   gdk_surface_set_frame_clock (surface, gdk_surface_get_frame_clock (surface->parent));
 
   GDK_END_MACOS_ALLOC_POOL;

gdk/macos/gdkmacostoplevelsurface.c

@@ -261,30 +261,7 @@ _gdk_macos_toplevel_surface_present (GdkToplevel       *toplevel,
   if (gdk_toplevel_layout_get_fullscreen (layout, &fullscreen))
     {
       if (fullscreen)
-        {
-          GdkMonitor *fullscreen_monitor =
-            gdk_toplevel_layout_get_fullscreen_monitor (layout);
-
-          if (fullscreen_monitor)
-            {
-              int x = 0, y = 0;
-
-              _gdk_macos_display_position_surface (GDK_MACOS_DISPLAY (display),
-                                                   GDK_MACOS_SURFACE (self),
-                                                   fullscreen_monitor,
-                                                   &x, &y);
-
-              GDK_DEBUG (MISC, "Moving toplevel \"%s\" to %d,%d",
-                         GDK_MACOS_SURFACE (self)->title ?
-                         GDK_MACOS_SURFACE (self)->title :
-                         "untitled",
-                         x, y);
-
-              _gdk_macos_surface_move (GDK_MACOS_SURFACE (self), x, y);
-            }
-
-          _gdk_macos_toplevel_surface_fullscreen (self);
-        }
+        _gdk_macos_toplevel_surface_fullscreen (self);
       else
         _gdk_macos_toplevel_surface_unfullscreen (self);
     }
@@ -297,7 +274,6 @@ _gdk_macos_toplevel_surface_present (GdkToplevel       *toplevel,
 
       _gdk_macos_display_position_surface (GDK_MACOS_DISPLAY (display),
                                            GDK_MACOS_SURFACE (self),
-                                           gdk_toplevel_layout_get_fullscreen_monitor (layout),
                                            &x, &y);
 
       GDK_DEBUG (MISC, "Placing new toplevel \"%s\" at %d,%d",
@@ -615,11 +591,11 @@ _gdk_macos_toplevel_surface_constructed (GObject *object)
                                                  defer:NO
                                                 screen:screen];
 
-  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
-
   /* Allow NSWindow to go fullscreen */
   [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
 
+  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
+
   frame_clock = _gdk_frame_clock_idle_new ();
   gdk_surface_set_frame_clock (surface, frame_clock);
   g_object_unref (frame_clock);
@@ -681,7 +657,6 @@ _gdk_macos_toplevel_surface_attach_to_parent (GdkMacosToplevelSurface *self)
       _gdk_macos_display_clear_sorting (GDK_MACOS_DISPLAY (surface->display));
       _gdk_macos_display_position_surface (GDK_MACOS_DISPLAY (surface->display),
                                            GDK_MACOS_SURFACE (surface),
-                                           NULL,
                                            &x, &y);
       _gdk_macos_surface_move (GDK_MACOS_SURFACE (surface), x, y);
     }

gdk/meson.build

@@ -128,8 +128,8 @@ install_headers(gdk_deprecated_headers, subdir: 'gtk-4.0/gdk/deprecated')
 gdk_sources = gdk_public_sources + gdk_deprecated_sources
 
 gdk_private_h_sources = files([
-  'gdkdevicetoolprivate.h',
   'gdkeventsprivate.h',
+  'gdkdevicetoolprivate.h',
   'gdkhslaprivate.h',
   'gdkmonitorprivate.h',
   'gdkseatdefaultprivate.h',

gdk/wayland/gdkcairocontext-wayland.c

@@ -198,8 +198,17 @@ static void
 gdk_wayland_cairo_context_empty_frame (GdkDrawContext *draw_context)
 {
   GdkSurface *surface = gdk_draw_context_get_surface (draw_context);
+  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
 
-  gdk_wayland_surface_handle_empty_frame (surface);
+  if (!impl->has_pending_subsurface_commits)
+    return;
+
+  gdk_wayland_surface_sync (surface);
+  gdk_wayland_surface_request_frame (surface);
+
+  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland surface commit", NULL);
+  gdk_wayland_surface_commit (surface);
+  gdk_wayland_surface_notify_committed (surface);
 }
 
 static void

gdk/wayland/gdkcursor-wayland.c

@@ -155,39 +155,31 @@ static const struct wl_buffer_listener buffer_listener = {
 struct wl_buffer *
 _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
                                 GdkCursor         *cursor,
-                                double             desired_scale,
-                                gboolean           use_viewporter,
+                                guint              desired_scale,
                                 guint              image_index,
                                 int               *hotspot_x,
                                 int               *hotspot_y,
                                 int               *width,
                                 int               *height,
-                                double            *scale)
+                                int               *scale)
 {
   GdkTexture *texture;
 
   if (gdk_cursor_get_name (cursor))
     {
       struct wl_cursor *c;
-      int scale_factor;
 
       if (g_str_equal (gdk_cursor_get_name (cursor), "none"))
-        {
-          *hotspot_x = *hotspot_y = 0;
-          *width = *height = 0;
-          *scale = 1;
-          return NULL;
-        }
-
-      scale_factor = (int) ceil (desired_scale);
+        goto none;
 
       c = gdk_wayland_cursor_load_for_name (display,
-                                            display->cursor_theme,
-                                            scale_factor,
+                                            _gdk_wayland_display_get_cursor_theme (display),
+                                            desired_scale,
                                             gdk_cursor_get_name (cursor));
       if (c && c->image_count > 0)
         {
           struct wl_cursor_image *image;
+          int cursor_scale;
 
           if (image_index >= c->image_count)
             {
@@ -199,27 +191,27 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
 
           image = c->images[image_index];
 
-          *width = display->cursor_theme_size;
-          *height = display->cursor_theme_size;
-          *scale = image->width / (double) *width;
-          *hotspot_x = image->hotspot_x / scale_factor;
-          *hotspot_y = image->hotspot_y / scale_factor;
-
-          if (*scale != scale_factor && !use_viewporter)
+          cursor_scale = desired_scale;
+          if ((image->width % cursor_scale != 0) ||
+              (image->height % cursor_scale != 0))
             {
-              g_warning (G_STRLOC " cursor image size (%d) not an integer "
-                         "multiple of theme size (%d)", image->width, *width);
-              *width = image->width;
-              *height = image->height;
-              *hotspot_x = image->hotspot_x;
-              *hotspot_y = image->hotspot_y;
-              *scale = 1;
+              g_warning (G_STRLOC " cursor image size (%dx%d) not an integer "
+                         "multiple of scale (%d)", image->width, image->height,
+                         cursor_scale);
+              cursor_scale = 1;
             }
 
+          *hotspot_x = image->hotspot_x / cursor_scale;
+          *hotspot_y = image->hotspot_y / cursor_scale;
+
+          *width = image->width / cursor_scale;
+          *height = image->height / cursor_scale;
+          *scale = cursor_scale;
+
           return wl_cursor_image_get_buffer (image);
         }
     }
-  else if (gdk_cursor_get_texture (cursor))
+  else
     {
       cairo_surface_t *surface;
       struct wl_buffer *buffer;
@@ -234,7 +226,7 @@ from_texture:
                                                             gdk_texture_get_width (texture),
                                                             gdk_texture_get_height (texture),
                                                             &GDK_FRACTIONAL_SCALE_INIT_INT (1));
-
+          
           gdk_texture_download (texture,
                                 cairo_image_surface_get_data (surface),
                                 cairo_image_surface_get_stride (surface));
@@ -258,63 +250,29 @@ from_texture:
 
       return buffer;
     }
-  else
-    {
-      if (!use_viewporter)
-        *scale = ceil (desired_scale);
-      else
-        *scale = desired_scale;
-
-      texture = gdk_cursor_get_texture_for_size (cursor,
-                                                 display->cursor_theme_size,
-                                                 *scale,
-                                                 width,
-                                                 height,
-                                                 hotspot_x,
-                                                 hotspot_y);
-
-      if (texture)
-        {
-          cairo_surface_t *surface;
-          struct wl_buffer *buffer;
-
-          surface = gdk_wayland_display_create_shm_surface (display,
-                                                            gdk_texture_get_width (texture),
-                                                            gdk_texture_get_height (texture),
-                                                            &GDK_FRACTIONAL_SCALE_INIT_INT (1));
-
-          gdk_texture_download (texture,
-                                cairo_image_surface_get_data (surface),
-                                cairo_image_surface_get_stride (surface));
-          cairo_surface_mark_dirty (surface);
-
-          buffer = _gdk_wayland_shm_surface_get_wl_buffer (surface);
-          wl_buffer_add_listener (buffer, &buffer_listener, surface);
-
-          g_object_unref (texture);
-
-          return buffer;
-        }
-    }
 
   if (gdk_cursor_get_fallback (cursor))
-    {
-      return _gdk_wayland_cursor_get_buffer (display,
-                                             gdk_cursor_get_fallback (cursor),
-                                             desired_scale,
-                                             use_viewporter,
-                                             image_index,
-                                             hotspot_x, hotspot_y,
-                                             width, height,
-                                             scale);
-    }
+    return _gdk_wayland_cursor_get_buffer (display,
+                                           gdk_cursor_get_fallback (cursor), 
+                                           desired_scale,
+                                           image_index,
+                                           hotspot_x, hotspot_y,
+                                           width, height,
+                                           scale);
   else
     {
       texture = gdk_texture_new_from_resource ("/org/gtk/libgdk/cursor/default");
       goto from_texture;
     }
 
-  g_assert_not_reached ();
+none:
+  *hotspot_x = 0;
+  *hotspot_y = 0;
+  *width = 0;
+  *height = 0;
+  *scale = 1;
+
+  return NULL;
 }
 
 guint

gdk/wayland/gdkdevice-wayland-private.h

@@ -62,7 +62,6 @@ struct _GdkWaylandPointerData {
   uint32_t grab_time;
 
   struct wl_surface *pointer_surface;
-  struct wp_viewport *pointer_surface_viewport;
   guint cursor_is_default: 1;
   GdkCursor *cursor;
   guint cursor_timeout_id;
@@ -70,7 +69,7 @@ struct _GdkWaylandPointerData {
   guint cursor_image_delay;
   guint touchpad_event_sequence;
 
-  double current_output_scale;
+  guint current_output_scale;
   GSList *pointer_surface_outputs;
 
   /* Accumulated event data for a pointer frame */

gdk/wayland/gdkdevice-wayland.c

@@ -260,25 +260,18 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
   GdkWaylandPointerData *pointer =
     gdk_wayland_device_get_pointer (wayland_device);
   struct wl_buffer *buffer;
-  int x, y, w, h;
-  double scale;
+  int x, y, w, h, scale;
   guint next_image_index, next_image_delay;
   gboolean retval = G_SOURCE_REMOVE;
   GdkWaylandTabletData *tablet;
-  gboolean use_viewport;
 
   tablet = gdk_wayland_seat_find_tablet (seat, device);
 
-  use_viewport = pointer->pointer_surface_viewport != NULL;
-  if (g_getenv ("NO_POINTER_VIEWPORT"))
-    use_viewport = FALSE;
-
   if (pointer->cursor)
     {
       buffer = _gdk_wayland_cursor_get_buffer (GDK_WAYLAND_DISPLAY (seat->display),
                                                pointer->cursor,
                                                pointer->current_output_scale,
-                                               use_viewport,
                                                pointer->cursor_image_index,
                                                &x, &y, &w, &h, &scale);
     }
@@ -317,16 +310,7 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
   if (buffer)
     {
       wl_surface_attach (pointer->pointer_surface, buffer, 0, 0);
-      if (use_viewport)
-        {
-          wp_viewport_set_source (pointer->pointer_surface_viewport,
-                                  wl_fixed_from_int (0),
-                                  wl_fixed_from_int (0),
-                                  wl_fixed_from_double (w * scale),
-                                  wl_fixed_from_double (h * scale));
-          wp_viewport_set_destination (pointer->pointer_surface_viewport, w, h);
-        }
-      else if (wl_surface_get_version (pointer->pointer_surface) >= WL_SURFACE_SET_BUFFER_SCALE_SINCE_VERSION)
+      if (wl_surface_get_version (pointer->pointer_surface) >= WL_SURFACE_SET_BUFFER_SCALE_SINCE_VERSION)
         wl_surface_set_buffer_scale (pointer->pointer_surface, scale);
       wl_surface_damage (pointer->pointer_surface,  0, 0, w, h);
       wl_surface_commit (pointer->pointer_surface);

gdk/wayland/gdkdisplay-wayland.c

@@ -97,7 +97,6 @@
 #define OUTPUT_VERSION_WITH_DONE 2
 #define NO_XDG_OUTPUT_DONE_SINCE_VERSION 3
 #define OUTPUT_VERSION           3
-#define XDG_WM_DIALOG_VERSION    1
 
 #ifdef HAVE_TOPLEVEL_STATE_SUSPENDED
 #define XDG_WM_BASE_VERSION      6
@@ -106,9 +105,6 @@
 #endif
 
 static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
-static void _gdk_wayland_display_set_cursor_theme  (GdkDisplay        *display,
-                                                    const char        *name,
-                                                    int                size);
 
 G_DEFINE_TYPE (GdkWaylandDisplay, gdk_wayland_display, GDK_TYPE_DISPLAY)
 
@@ -288,6 +284,97 @@ static const struct wl_shm_listener wl_shm_listener = {
   wl_shm_format
 };
 
+static void
+linux_dmabuf_done (void *data,
+                   struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1)
+{
+  GDK_DEBUG (MISC, "dmabuf feedback done");
+}
+
+static void
+linux_dmabuf_format_table (void *data,
+                           struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                           int32_t fd,
+                           uint32_t size)
+{
+  GdkWaylandDisplay *display_wayland = data;
+
+  display_wayland->linux_dmabuf_n_formats = size / 16;
+  display_wayland->linux_dmabuf_formats = mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+
+  GDK_DEBUG (MISC, "got dmabuf format table (%lu entries)", display_wayland->linux_dmabuf_n_formats);
+}
+
+static void
+linux_dmabuf_main_device (void *data,
+                          struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                          struct wl_array *device)
+{
+  dev_t dev G_GNUC_UNUSED;
+
+  memcpy (&dev, device->data, sizeof (dev_t));
+
+  GDK_DEBUG (MISC, "got dmabuf main device: %u %u", major (dev), minor (dev));
+}
+
+static void
+linux_dmabuf_tranche_done (void *data,
+                           struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1)
+{
+  GDK_DEBUG (MISC, "dmabuf feedback tranche done");
+}
+
+static void
+linux_dmabuf_tranche_target_device (void *data,
+                                    struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                                    struct wl_array *device)
+{
+  dev_t dev G_GNUC_UNUSED;
+
+  memcpy (&dev, device->data, sizeof (dev_t));
+
+  GDK_DEBUG (MISC, "got dmabuf tranche target device: %u %u", major (dev), minor (dev));
+}
+
+static void
+linux_dmabuf_tranche_formats (void *data,
+                              struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                              struct wl_array *indices)
+{
+  GdkWaylandDisplay *display_wayland = data;
+
+  GDK_DEBUG (MISC, "got dmabuf tranche formats (%lu entries):", indices->size / sizeof (guint16));
+  guint16 *pos;
+
+  wl_array_for_each (pos, indices)
+    {
+      LinuxDmabufFormat *fmt G_GNUC_UNUSED = &display_wayland->linux_dmabuf_formats[*pos];
+      uint32_t f G_GNUC_UNUSED = fmt->fourcc;
+      uint64_t m G_GNUC_UNUSED = fmt->modifier;
+      GDK_DEBUG (MISC, "  %.4s:%#" G_GINT64_MODIFIER "x", (char *) &f, m);
+    }
+}
+
+static void
+linux_dmabuf_tranche_flags (void *data,
+                            struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                            uint32_t flags)
+{
+  GDK_DEBUG (MISC,
+             "got dmabuf tranche flags: %s",
+             flags & ZWP_LINUX_DMABUF_FEEDBACK_V1_TRANCHE_FLAGS_SCANOUT ? "scanout" : "");
+}
+
+static const struct zwp_linux_dmabuf_feedback_v1_listener linux_dmabuf_feedback_listener = {
+  linux_dmabuf_done,
+  linux_dmabuf_format_table,
+  linux_dmabuf_main_device,
+  linux_dmabuf_tranche_done,
+  linux_dmabuf_tranche_target_device,
+  linux_dmabuf_tranche_formats,
+  linux_dmabuf_tranche_flags,
+};
+
 static void
 server_decoration_manager_default_mode (void                                          *data,
                                         struct org_kde_kwin_server_decoration_manager *manager,
@@ -354,7 +441,7 @@ gdk_registry_handle_global (void               *data,
     {
       display_wayland->compositor =
         wl_registry_bind (display_wayland->wl_registry, id,
-                          &wl_compositor_interface, MIN (version, 6));
+                          &wl_compositor_interface, MIN (version, 5));
     }
   else if (strcmp (interface, "wl_shm") == 0)
     {
@@ -364,14 +451,12 @@ gdk_registry_handle_global (void               *data,
     }
   else if (strcmp (interface, "zwp_linux_dmabuf_v1") == 0 && version >= 4)
     {
-      struct zwp_linux_dmabuf_feedback_v1 *feedback;
-
       display_wayland->linux_dmabuf =
         wl_registry_bind (display_wayland->wl_registry, id, &zwp_linux_dmabuf_v1_interface, version);
-      feedback = zwp_linux_dmabuf_v1_get_default_feedback (display_wayland->linux_dmabuf);
-      display_wayland->dmabuf_formats_info = dmabuf_formats_info_new (GDK_DISPLAY (display_wayland),
-                                                                      "default",
-                                                                      feedback);
+      display_wayland->linux_dmabuf_feedback =
+        zwp_linux_dmabuf_v1_get_default_feedback (display_wayland->linux_dmabuf);
+     zwp_linux_dmabuf_feedback_v1_add_listener (display_wayland->linux_dmabuf_feedback,
+                                                &linux_dmabuf_feedback_listener, display_wayland);
       _gdk_wayland_display_async_roundtrip (display_wayland);
     }
   else if (strcmp (interface, "xdg_wm_base") == 0)
@@ -383,13 +468,6 @@ gdk_registry_handle_global (void               *data,
     {
       display_wayland->zxdg_shell_v6_id = id;
     }
-  else if (strcmp (interface, "xdg_wm_dialog_v1") == 0)
-    {
-      display_wayland->xdg_wm_dialog =
-        wl_registry_bind (display_wayland->wl_registry, id,
-                          &xdg_wm_dialog_v1_interface,
-                          MIN (version, XDG_WM_DIALOG_VERSION));
-    }
   else if (strcmp (interface, "gtk_shell1") == 0)
     {
       display_wayland->gtk_shell =
@@ -532,13 +610,7 @@ gdk_registry_handle_global (void               *data,
                           &wp_presentation_interface,
                           MIN (version, 1));
     }
-  else if (strcmp (interface, wp_single_pixel_buffer_manager_v1_interface.name) == 0)
-    {
-      display_wayland->single_pixel_buffer =
-        wl_registry_bind (display_wayland->wl_registry, id,
-                          &wp_single_pixel_buffer_manager_v1_interface,
-                          MIN (version, 1));
-    }
+
 
   g_hash_table_insert (display_wayland->known_globals,
                        GUINT_TO_POINTER (id), g_strdup (interface));
@@ -749,9 +821,10 @@ gdk_wayland_display_dispose (GObject *object)
   g_clear_pointer (&display_wayland->fractional_scale, wp_fractional_scale_manager_v1_destroy);
   g_clear_pointer (&display_wayland->viewporter, wp_viewporter_destroy);
   g_clear_pointer (&display_wayland->presentation, wp_presentation_destroy);
-  g_clear_pointer (&display_wayland->single_pixel_buffer, wp_single_pixel_buffer_manager_v1_destroy);
   g_clear_pointer (&display_wayland->linux_dmabuf, zwp_linux_dmabuf_v1_destroy);
-  g_clear_pointer (&display_wayland->dmabuf_formats_info, dmabuf_formats_info_free);
+  g_clear_pointer (&display_wayland->linux_dmabuf_feedback, zwp_linux_dmabuf_feedback_v1_destroy);
+  if (display_wayland->linux_dmabuf_formats)
+    munmap (display_wayland->linux_dmabuf_formats, display_wayland->linux_dmabuf_n_formats * 16);
 
   g_clear_pointer (&display_wayland->shm, wl_shm_destroy);
   g_clear_pointer (&display_wayland->wl_registry, wl_registry_destroy);
@@ -1053,7 +1126,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   display_class->get_monitors = gdk_wayland_display_get_monitors;
   display_class->get_monitor_at_surface = gdk_wayland_display_get_monitor_at_surface;
   display_class->get_setting = gdk_wayland_display_get_setting;
-  display_class->set_cursor_theme = _gdk_wayland_display_set_cursor_theme;
+  display_class->set_cursor_theme = gdk_wayland_display_set_cursor_theme;
 }
 
 static void
@@ -1126,22 +1199,11 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
  * @size: the size to use for cursors
  *
  * Sets the cursor theme for the given @display.
- *
- * Deprecated: 4.16: Use the cursor-related properties of
- *   [GtkSettings](../gtk4/class.Settings.html) to set the cursor theme
  */
 void
 gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
                                       const char *name,
                                       int         size)
-{
-  _gdk_wayland_display_set_cursor_theme (display, name, size);
-}
-
-static void
-_gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
-                                       const char *name,
-                                       int         size)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY(display);
   struct wl_cursor_theme *theme;
@@ -1210,7 +1272,7 @@ _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland)
   else
     name = "default";
 
-  _gdk_wayland_display_set_cursor_theme (GDK_DISPLAY (display_wayland), name, size);
+  gdk_wayland_display_set_cursor_theme (GDK_DISPLAY (display_wayland), name, size);
   g_value_unset (&v);
 
   gdk_profiler_end_mark (before, "Wayland cursor theme load", NULL);
@@ -1746,7 +1808,6 @@ static TranslationEntry translations[] = {
   { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
   { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
   { FALSE, "org.gnome.desktop.interface", "font-rgba-order", "gtk-xft-rgba", G_TYPE_NONE, { .i = 0 } },
-  { FALSE, "org.gnome.desktop.interface", "font-rendering", "gtk-font-rendering", G_TYPE_ENUM, { .i = 0 } },
   { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 1 } },
   { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
   { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
@@ -1838,7 +1899,6 @@ apply_portal_setting (TranslationEntry *entry,
       entry->fallback.s = g_intern_string (g_variant_get_string (value, NULL));
       break;
     case G_TYPE_INT:
-    case G_TYPE_ENUM:
       entry->fallback.i = g_variant_get_int32 (value);
       break;
     case G_TYPE_BOOLEAN:
@@ -2088,9 +2148,6 @@ set_value_from_entry (GdkDisplay       *display,
         case G_TYPE_BOOLEAN:
           g_value_set_boolean (value, entry->fallback.b);
           break;
-        case G_TYPE_ENUM:
-          g_value_set_enum (value, entry->fallback.i);
-          break;
         case G_TYPE_NONE:
           if (g_str_equal (entry->setting, "gtk-fontconfig-timestamp"))
             g_value_set_uint (value, (guint)entry->fallback.i);
@@ -2141,11 +2198,6 @@ set_value_from_entry (GdkDisplay       *display,
                                   ? g_settings_get_boolean (settings, entry->key)
                                   : entry->fallback.b);
       break;
-    case G_TYPE_ENUM:
-      g_value_set_enum (value, settings && entry->valid
-                               ? g_settings_get_enum (settings, entry->key)
-                               : entry->fallback.i);
-      break;
     case G_TYPE_NONE:
       if (g_str_equal (entry->setting, "gtk-fontconfig-timestamp"))
         g_value_set_uint (value, (guint)entry->fallback.i);

gdk/wayland/gdkdisplay-wayland.h

@@ -40,8 +40,6 @@
 #include <gdk/wayland/fractional-scale-v1-client-protocol.h>
 #include <gdk/wayland/viewporter-client-protocol.h>
 #include <gdk/wayland/presentation-time-client-protocol.h>
-#include <gdk/wayland/single-pixel-buffer-v1-client-protocol.h>
-#include <gdk/wayland/xdg-dialog-v1-client-protocol.h>
 
 #include <glib.h>
 #include <gdk/gdkkeys.h>
@@ -50,7 +48,6 @@
 
 #include "gdkdisplayprivate.h"
 #include "gdkwaylanddevice.h"
-#include "gdkdmabuf-wayland-private.h"
 #include "cursor/wayland-cursor.h"
 
 #include <epoxy/egl.h>
@@ -75,6 +72,13 @@ typedef enum _GdkWaylandShellVariant
   GDK_WAYLAND_SHELL_VARIANT_ZXDG_SHELL_V6
 } GdkWaylandShellVariant;
 
+typedef struct
+{
+  uint32_t fourcc;
+  uint32_t padding;
+  uint64_t modifier;
+} LinuxDmabufFormat;
+
 struct _GdkWaylandDisplay
 {
   GdkDisplay parent_instance;
@@ -100,10 +104,11 @@ struct _GdkWaylandDisplay
   struct wl_compositor *compositor;
   struct wl_shm *shm;
   struct zwp_linux_dmabuf_v1 *linux_dmabuf;
-  DmabufFormatsInfo *dmabuf_formats_info;
+  struct zwp_linux_dmabuf_feedback_v1 *linux_dmabuf_feedback;
+  gsize linux_dmabuf_n_formats;
+  LinuxDmabufFormat *linux_dmabuf_formats;
   struct xdg_wm_base *xdg_wm_base;
   struct zxdg_shell_v6 *zxdg_shell_v6;
-  struct xdg_wm_dialog_v1 *xdg_wm_dialog;
   struct gtk_shell1 *gtk_shell;
   struct wl_data_device_manager *data_device_manager;
   struct wl_subcompositor *subcompositor;
@@ -122,7 +127,6 @@ struct _GdkWaylandDisplay
   struct wp_fractional_scale_manager_v1 *fractional_scale;
   struct wp_viewporter *viewporter;
   struct wp_presentation *presentation;
-  struct wp_single_pixel_buffer_manager_v1 *single_pixel_buffer;
 
   GList *async_roundtrips;
 

gdk/wayland/gdkdmabuf-wayland-private.h

@@ -1,77 +0,0 @@
-/*
- * gdkdmabuf-wayland.h
- *
- * Copyright 2023 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config.h"
-
-#include <stdint.h>
-#include <wayland-client.h>
-#include <wayland-egl.h>
-
-#include <glib.h>
-#include <gdk/gdkkeys.h>
-#include <gdk/gdksurface.h>
-
-G_BEGIN_DECLS
-
-typedef struct
-{
-  uint32_t fourcc;
-  uint32_t padding;
-  uint64_t modifier;
-} DmabufFormat;
-
-typedef struct
-{
-  dev_t target_device;
-  guint32 flags;
-  gsize n_formats;
-  DmabufFormat *formats;
-} DmabufTranche;
-
-typedef struct
-{
-  dev_t main_device;
-  GPtrArray *tranches;
-} DmabufFormats;
-
-typedef struct DmabufFormatsInfo DmabufFormatsInfo;
-
-struct DmabufFormatsInfo
-{
-  GdkDisplay *display;
-  char *name;
-  struct zwp_linux_dmabuf_feedback_v1 *feedback;
-
-  gsize n_dmabuf_formats;
-  DmabufFormat *dmabuf_format_table;
-
-  DmabufFormats *dmabuf_formats;
-  DmabufFormats *pending_dmabuf_formats;
-  DmabufTranche *pending_tranche;
-};
-
-DmabufFormatsInfo * dmabuf_formats_info_new  (GdkDisplay                          *display,
-                                              const char                          *name,
-                                              struct zwp_linux_dmabuf_feedback_v1 *feedback);
-
-void                dmabuf_formats_info_free (DmabufFormatsInfo                   *info);
-
-G_END_DECLS

gdk/wayland/gdkdmabuf-wayland.c

@@ -1,241 +0,0 @@
-#include "config.h"
-
-#include "gdkdmabuf-wayland-private.h"
-
-#include "gdkdebugprivate.h"
-#include "gdkdmabufformatsprivate.h"
-#include "gdkdmabufformatsbuilderprivate.h"
-#include "gdkdmabufformatsprivate.h"
-
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/sysmacros.h>
-
-#include "linux-dmabuf-unstable-v1-client-protocol.h"
-
-
-static DmabufTranche *
-dmabuf_tranche_new (void)
-{
-  return g_new0 (DmabufTranche, 1);
-}
-
-static void
-dmabuf_tranche_free (DmabufTranche *tranche)
-{
-  g_free (tranche->formats);
-  g_free (tranche);
-}
-
-static DmabufFormats *
-dmabuf_formats_new (void)
-{
-  DmabufFormats *formats;
-
-  formats = g_new0 (DmabufFormats, 1);
-  formats->tranches = g_ptr_array_new_with_free_func ((GDestroyNotify) dmabuf_tranche_free);
-
-  return formats;
-}
-
-static void
-dmabuf_formats_free (DmabufFormats *formats)
-{
-  g_ptr_array_unref (formats->tranches);
-  g_free (formats);
-}
-
-static void
-update_dmabuf_formats (DmabufFormatsInfo *info)
-{
-  DmabufFormats *formats = info->dmabuf_formats;
-
-  GDK_DISPLAY_DEBUG (info->display, MISC,
-                     "dmabuf format table (%lu entries)", info->n_dmabuf_formats);
-  GDK_DISPLAY_DEBUG (info->display, MISC,
-                     "dmabuf main device: %u %u",
-                     major (formats->main_device),
-                     minor (formats->main_device));
-
-  for (gsize i = 0; i < formats->tranches->len; i++)
-    {
-      DmabufTranche *tranche = g_ptr_array_index (formats->tranches, i);
-
-      GDK_DISPLAY_DEBUG (info->display, MISC,
-                         "dmabuf tranche target device: %u %u",
-                         major (tranche->target_device),
-                         minor (tranche->target_device));
-
-      GDK_DISPLAY_DEBUG (info->display, MISC,
-                         "dmabuf%s tranche (%lu entries):",
-                         tranche->flags & ZWP_LINUX_DMABUF_FEEDBACK_V1_TRANCHE_FLAGS_SCANOUT ? " scanout" : "",
-                         tranche->n_formats);
-
-      for (gsize j = 0; j < tranche->n_formats; j++)
-        {
-          GDK_DISPLAY_DEBUG (info->display, MISC,
-                             "  %.4s:%#" G_GINT64_MODIFIER "x",
-                             (char *) &(tranche->formats[j].fourcc),
-                             tranche->formats[j].modifier);
-        }
-    }
-}
-
-static void
-linux_dmabuf_done (void *data,
-                   struct zwp_linux_dmabuf_feedback_v1 *feedback)
-{
-  DmabufFormatsInfo *info = data;
-
-  g_clear_pointer (&info->dmabuf_formats, dmabuf_formats_free);
-
-  info->dmabuf_formats = info->pending_dmabuf_formats;
-  info->pending_dmabuf_formats = NULL;
-
-  update_dmabuf_formats (info);
-}
-
-static void
-linux_dmabuf_format_table (void *data,
-                           struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                           int32_t fd,
-                           uint32_t size)
-{
-  DmabufFormatsInfo *info = data;
-
-  if (info->dmabuf_formats)
-    munmap (info->dmabuf_formats, sizeof (DmabufFormat) * info->n_dmabuf_formats);
-
-  info->n_dmabuf_formats = size / 16;
-  info->dmabuf_format_table = mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
-}
-
-static void
-linux_dmabuf_main_device (void *data,
-                          struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                          struct wl_array *device)
-{
-  DmabufFormatsInfo *info = data;
-  dev_t dev;
-
-  memcpy (&dev, device->data, sizeof (dev_t));
-
-  g_assert (info->pending_dmabuf_formats == NULL);
-
-  info->pending_dmabuf_formats = dmabuf_formats_new ();
-  info->pending_dmabuf_formats->main_device = dev;
-}
-
-static void
-linux_dmabuf_tranche_done (void *data,
-                           struct zwp_linux_dmabuf_feedback_v1 *feedback)
-{
-  DmabufFormatsInfo *info = data;
-
-  g_ptr_array_add (info->pending_dmabuf_formats->tranches,
-                   info->pending_tranche);
-
-  info->pending_tranche = NULL;
-}
-
-static void
-linux_dmabuf_tranche_target_device (void *data,
-                                    struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                                    struct wl_array *device)
-{
-  DmabufFormatsInfo *info = data;
-  dev_t dev;
-  DmabufTranche *tranche;
-
-  memcpy (&dev, device->data, sizeof (dev_t));
-
-  g_assert (info->pending_tranche == NULL);
-
-  tranche = dmabuf_tranche_new ();
-  tranche->target_device = dev;
-
-  info->pending_tranche = tranche;
-}
-
-static void
-linux_dmabuf_tranche_formats (void *data,
-                              struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                              struct wl_array *indices)
-{
-  DmabufFormatsInfo *info = data;
-  DmabufTranche *tranche;
-  int i;
-  guint16 *pos;
-
-  g_assert (info->pending_tranche != NULL);
-  tranche = info->pending_tranche;
-
-  tranche->n_formats = indices->size / sizeof (guint16);
-  tranche->formats = g_new (DmabufFormat, tranche->n_formats);
-
-  i = 0;
-  wl_array_for_each (pos, indices)
-    {
-      tranche->formats[i++] = info->dmabuf_format_table[*pos];
-    }
-}
-
-static void
-linux_dmabuf_tranche_flags (void *data,
-                            struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                            uint32_t flags)
-{
-  DmabufFormatsInfo *info = data;
-  DmabufTranche *tranche;
-
-  g_assert (info->pending_tranche != NULL);
-  tranche = info->pending_tranche;
-  tranche->flags = flags;
-}
-
-static const struct zwp_linux_dmabuf_feedback_v1_listener feedback_listener = {
-  linux_dmabuf_done,
-  linux_dmabuf_format_table,
-  linux_dmabuf_main_device,
-  linux_dmabuf_tranche_done,
-  linux_dmabuf_tranche_target_device,
-  linux_dmabuf_tranche_formats,
-  linux_dmabuf_tranche_flags,
-};
-
-DmabufFormatsInfo *
-dmabuf_formats_info_new (GdkDisplay                          *display,
-                         const char                          *name,
-                         struct zwp_linux_dmabuf_feedback_v1 *feedback)
-{
-  DmabufFormatsInfo *info;
-
-  info = g_new0 (DmabufFormatsInfo, 1);
-
-  info->display = display;
-  info->name = g_strdup (name);
-  info->feedback = feedback;
-
-  if (info->feedback)
-    zwp_linux_dmabuf_feedback_v1_add_listener (info->feedback,
-                                               &feedback_listener, info);
-
-  return info;
-}
-
-void
-dmabuf_formats_info_free (DmabufFormatsInfo *info)
-{
-  g_free (info->name);
-  g_clear_pointer (&info->feedback, zwp_linux_dmabuf_feedback_v1_destroy);
-  if (info->dmabuf_format_table)
-    {
-      munmap (info->dmabuf_format_table, info->n_dmabuf_formats * 16);
-      info->dmabuf_format_table = NULL;
-    }
-  g_clear_pointer (&info->dmabuf_formats, dmabuf_formats_free);
-  g_clear_pointer (&info->pending_dmabuf_formats, dmabuf_formats_free);
-  g_clear_pointer (&info->pending_tranche, dmabuf_tranche_free);
-
-  g_free (info);
-}