listitemwidget: Update some accessible state

Pass the selected state on to a11y. Fixes: #6663
listview: Fix some oversights
2024-04-26 11:50:30 -04:00 · 2024-04-26 11:19:59 -04:00 · 2024-04-25 20:46:31 +00:00 · 2024-04-25 22:46:35 +03:00 · 2024-04-25 03:01:44 +00:00 · 2024-04-24 22:01:56 -04:00
225 changed files with 8223 additions and 5589 deletions
@@ -445,9 +445,8 @@ reference:
            --force-fallback-for=gdk-pixbuf,pango
            -Dintrospection=enabled
            -Ddocumentation=true
-            -Dgtk_doc=true
            -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:gtk_doc=true
+            -Dpango:documentation=true
            -Dbuild-demos=false
            -Dbuild-examples=false
            -Dbuild-tests=false
@@ -24,7 +24,7 @@ flatpak build ${builddir} meson \
                -Dbuild-examples=false \
                -Dintrospection=disabled \
                -Dbuild-demos=true \
-                -Ddemo-profile=devel \
+                -Dprofile=devel \
                _flatpak_build

 flatpak build --env=CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA ${builddir} ninja -C _flatpak_build install
@@ -34,7 +34,8 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-shared-mime-info \
    mingw-w64-$MSYS2_ARCH-python-gobject \
    mingw-w64-$MSYS2_ARCH-shaderc \
-    mingw-w64-$MSYS2_ARCH-vulkan
+    mingw-w64-$MSYS2_ARCH-vulkan \
+    mingw-w64-$MSYS2_ARCH-vulkan-headers

 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -44,7 +45,7 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
-meson \
+meson setup \
    -Dx11-backend=false \
    -Dwayland-backend=false \
    -Dwin32-backend=true \
@@ -35,7 +35,7 @@ The issue tracker is meant to be used for actionable issues only.

 You should not open a new issue for security related questions.

-When in doubt, follow [security](https://security.gnome.org/).
+When in doubt, follow the process for [GNOME security issues](https://security.gnome.org/).

 ### Bug reports

@@ -144,33 +144,28 @@ $ git clone https://gitlab.gnome.org/yourusername/gtk.git
 $ cd gtk
 ```

-**Note**: if you plan to push changes to back to the main repository and
-have a GNOME account, you can skip the fork, and use the following instead:
-
-```sh
-$ git clone git@gitlab.gnome.org:GNOME/gtk.git
-$ cd gtk
-```
-
 To compile the Git version of GTK on your system, you will need to
 configure your build using Meson:

 ```sh
-$ meson _builddir .
-$ cd _builddir
-$ ninja
+$ meson setup _builddir .
+$ meson compile -C _builddir
 ```

 Typically, you should work on your own branch:

 ```sh
-$ git checkout -b your-branch
+$ git switch -C your-branch
 ```

 Once you've finished working on the bug fix or feature, push the branch
 to the Git repository and open a new merge request, to let the GTK
 maintainers review your contribution.

+**Important**: Do **not** attach a diff or a patch file to a GitLab issue.
+Patches cannot be reviewed, and do not not go through the CI pipeline. If
+you wish to submit your changes to GTK, always use a merge request.
+
 ### Code reviews

 Each contribution is reviewed by the core developers of the GTK project.
@@ -262,4 +257,4 @@ people committing to GTK to follow a few rules:

 If you have been contributing to GTK for a while and you don't have commit
 access to the repository, you may ask to obtain it following the [GNOME account
-process](https://wiki.gnome.org/AccountsTeam/NewAccounts).
+process](https://handbook.gnome.org/infrastructure/developer-access.html).
@@ -1,6 +1,163 @@
-Overview of Changes in 4.14.2, xx-xx-xxxx
+Overview of Changes in 4.15.1, xx-xx-xxxx
 =========================================

+Overview of Changes in 4.15.0, 21-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)
+ Hebrew
+ Kabyle
+ Persian
+ Polish
+ Russian
+ Slovenian
+ Swedish
+ Turkish
+
+
+Overview of Changes in 4.14.2, 03-04-2024
+=========================================
+
+* GtkScale:
+ - Improve positioning of values in some cases
+
+* Theme:
+ - Make progress in entries visible
+
+* Accessibility:
+ - Fix text insertion handling
+
+* GDK:
+ - dnd: Use the default cursor durion motion
+ - dnd: Use a better cursor for indicating the move action
+
+* GSK:
+ - gl: Handle offloads in offscreen context better
+ - Fix text rendering problems with some fonts
+
+* Wayland:
+ - Tighten up some protocol version checks
+ - Use the presentation time protocol
+ - Fix a crash with subsurfaces
+ - Improve settings portal handling
+
+* macOS:
+ - Fix up the app menu support
+
+* Windows:
+ - Fix problems with minimization
+ - Fix build without fontconfig
+
+* Debugging:
+ - Add font settings in the inspector
+
+* Demos:
+ - Clean up the application demo
+ - Update cursor images for the cursor demo
+
+* Translation updates:
+ Catalan
+ Czech
+ French
+ Georgian
+ Hebrew
+ Persian
+ Slovenian
+ Turkish
+ Ukrainian
+
+
 Overview of Changes in 4.14.1, 16-03-2024
 =========================================

@@ -125,7 +125,7 @@ version, for example `gtk-4-10`.
 How to report bugs
 ------------------

-Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/new).
+Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/).

 In the bug report please include:

@@ -186,7 +186,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
            ],
            "sources" : [
                {
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
            ],
            "sources" : [
                {
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
            ],
            "sources" : [
                {
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
            ],
            "sources" : [
                {
@@ -15,12 +15,54 @@ 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"));
@@ -29,6 +71,10 @@ 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);
    }

@@ -116,6 +116,7 @@
    <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>
@@ -0,0 +1,138 @@
+<?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>
@@ -456,43 +456,33 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
 {
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
  GdkFrameClock *frame_clock;
-  GdkFrameTimings *start, *end;
-  gint64 start_counter, end_counter;
-  gint64 n_frames, expected_frames;
-  gint64 start_timestamp, end_timestamp;
+  GdkFrameTimings *end;
+  gint64 end_counter;
+  double fps, expected_fps;
  gint64 interval;

  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (fishbowl));
  if (frame_clock == NULL)
    return;

-  start_counter = gdk_frame_clock_get_history_start (frame_clock);
-  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
-  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
-  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
-       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
-       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
-    end_counter--;
-  if (end_counter - start_counter < 4)
+  fps = gdk_frame_clock_get_fps (frame_clock);
+  if (fps <= 0.0)
    return;

-  start_timestamp = gdk_frame_timings_get_presentation_time (start);
-  end_timestamp = gdk_frame_timings_get_presentation_time (end);
-  if (start_timestamp == 0 || end_timestamp == 0)
-    {
-      start_timestamp = gdk_frame_timings_get_frame_time (start);
-      end_timestamp = gdk_frame_timings_get_frame_time (end);
-    }
-
-  n_frames = end_counter - start_counter;
-  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
-  priv->framerate = ((int)(priv->framerate * 100))/100.0;
-
+  priv->framerate = fps;
  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);

  if (!priv->benchmark)
    return;

+  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
+  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
+       end != NULL && !gdk_frame_timings_get_complete (end);
+       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
+    end_counter--;
+  if (end == NULL)
+    return;
+
  interval = gdk_frame_timings_get_refresh_interval (end);
  if (interval == 0)
    {
@@ -500,16 +490,16 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
      if (interval == 0)
        return;
    }
-  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
+  expected_fps = (double) G_USEC_PER_SEC / interval;

-  if (n_frames >= expected_frames)
+  if (fps > (expected_fps - 1))
    {
      if (priv->last_benchmark_change > 0)
        priv->last_benchmark_change *= 2;
      else
        priv->last_benchmark_change = 1;
    }
-  else if (n_frames + 1 < expected_frames)
+  else if (0.95 * fps < expected_fps)
    {
      if (priv->last_benchmark_change < 0)
        priv->last_benchmark_change--;
@@ -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), shadertoy);
+  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (aspect), gtk_graphics_offload_new (shadertoy));

  sw = gtk_scrolled_window_new ();
  gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 250);
@@ -74,6 +74,7 @@ in a selector, widget names must be prefixed with a &num; 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) | |
@@ -8,6 +8,10 @@ gtk4-broadwayd
 The Broadway display server
 ---------------------------

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

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------
 |   **gtk4-builder-tool** <COMMAND> [OPTIONS...] <FILE>
@@ -8,6 +8,9 @@ gtk4-demo-application
 Demonstrate GtkApplication
 --------------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands

 SYNOPSIS
 --------
@@ -8,6 +8,10 @@ gtk4-demo
 Demonstrate GTK widgets
 -----------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -8,6 +8,10 @@ gtk4-encode-symbolic-svg
 Symbolic icon conversion utility
 --------------------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -8,6 +8,10 @@ gtk4-icon-browser
 List themed icons
 -----------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -8,6 +8,10 @@ gtk4-launch
 Launch an application
 ---------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -8,6 +8,10 @@ gtk4-node-editor
 Editor render nodes
 -----------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -8,6 +8,10 @@ gtk4-path-tool
 GskPath Utility
 -----------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------
 |   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>
@@ -8,6 +8,10 @@ gtk4-query-settings
 Print name and value of GTK settings
 ------------------------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -8,6 +8,10 @@ gtk4-rendernode-tool
 GskRenderNode Utility
 -----------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------
 |   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
@@ -45,13 +49,14 @@ without any titlebar.
 Rendering
 ^^^^^^^^^

-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.
+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.

 ``--renderer=RENDERER``

  Use the given renderer. Use ``--renderer=help`` to get a information
-  about poassible values for the ``RENDERER``.
+  about possible values for the ``RENDERER``.

 Benchmark
 ^^^^^^^^^
@@ -93,4 +98,4 @@ exit code is 1. If the images are identical, it is 0.

 ``--quiet``

-  Don't write results to stdout.`
+  Don't write results to stdout.
@@ -8,6 +8,10 @@ gtk4-update-icon-cache
 Icon theme caching utility
 --------------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -8,6 +8,10 @@ gtk4-widget-factory
 Showcase GTK widgets and styles
 -------------------------------

+:Version: GTK
+:Manual section: 1
+:Manual group: GTK commands
+
 SYNOPSIS
 --------

@@ -80,7 +80,7 @@ if get_option('man-pages') and rst2man.found()
    [ 'gtk4-path-tool', '1', ],
  ]

-  if get_option('demos')
+  if get_option('build-demos')
    rst_files += [
      [ 'gtk4-demo', '1', ],
      [ 'gtk4-demo-application', '1', ],
@@ -58,12 +58,12 @@ GTK is divided into three parts:
   storage types for efficient use in GUI applications, and much more.

 [gnu-lgpl]: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
-[glib]: https://developer.gnome.org/glib/stable/
-[gobject]: https://developer.gnome.org/gobject/stable/
-[gio]: https://developer.gnome.org/gio/stable/
+[glib]: https://docs.gtk.org/glib/
+[gobject]: https://docs.gtk.org/gobject/
+[gio]: https://docs.gtk.org/gio/
 [cairo]: https://www.cairographics.org/manual/
 [opengl]: https://www.opengl.org/about/
 [vulkan]: https://www.vulkan.org/
-[pango]: https://pango.gnome.org/
-[gdkpixbuf]: https://developer.gnome.org/gdk-pixbuf/stable/
+[pango]: https://docs.gtk.org/pango/
+[gdkpixbuf]: https://docs.gtk.org/gdk-pixbuf/
 [graphene]: https://ebassi.github.io/graphene/
@@ -27,7 +27,7 @@ the question you have, this list is a good place to start.
    Every major version of GTK comes with a [migration guide](#migrating). You may also
    find useful information in the documentation for specific widgets and functions. If
    you have a question not covered in the manual, feel free to ask, and please
-    [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/new) against the
+    [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/) against the
    documentation.

 *  Should I maintain parallel versions of my UI in GTK x and GTK y?
@@ -54,7 +54,7 @@ the question you have, this list is a good place to start.
    For strings returned from functions, they will be declared "const" if they should
    not be freed. Non-const strings should be freed with `g_free()`. Arrays follow the
    same rule. If you find an undocumented exception to the rules, please
-    [file a bug report.](https://gitlab.gnome.org/GNOME/gtk/issues/new).
+    [file a bug report.](https://gitlab.gnome.org/GNOME/gtk/issues/).

    The transfer annotations for gobject-introspection that are part of the
    documentation can provide useful hints for memory handling semantics as well.
@@ -4,7 +4,7 @@ Slug: gtk-resources
 ## Opening a bug or feature request

 If you encounter a bug, misfeature, or missing feature in GTK, please
-file a bug report on our [GitLab project](https://gitlab.gnome.org/GNOME/gtk/issues/new).
+file a bug report on our [GitLab project](https://gitlab.gnome.org/GNOME/gtk/issues/).
 You should also file issues if the documentation is out of date with the
 existing API, or unclear.

@@ -217,6 +217,10 @@ 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

@@ -91,6 +91,31 @@ 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 = [];
@@ -215,11 +240,32 @@ 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;
@@ -987,7 +1033,14 @@ function handleDisplayCommands(display_commands)
            break;
        case DISPLAY_OP_DELETE_SURFACE:
            var id = cmd[1];
-            delete surfaces[id];
+	    if (id == surfaceWithMouse) {
+		surfaceWithMouse = 0;
+	    }
+	    if (id == realSurfaceWithMouse) {
+		realSurfaceWithMouse = 0;
+		firstTouchDownId = null;
+	    }
+           delete surfaces[id];
            break;
        case DISPLAY_OP_CHANGE_TEXTURE:
            var image = cmd[1];
@@ -1371,8 +1424,14 @@ function getEffectiveEventTarget (id) {
 function updateKeyboardStatus() {
    if (fakeInput != null && showKeyboardChanged) {
        showKeyboardChanged = false;
-        if (showKeyboard)
+        if (showKeyboard) {
+	    if (isAndroidChrome) {
+		fakeInput.blur();
+		fakeInput.value = ' '.repeat(80); // TODO: Should be exchange with broadway server
+		                                  // to bring real value here.
+	    }
            fakeInput.focus();
+	}
        else
            fakeInput.blur();
    }
@@ -2924,6 +2983,19 @@ 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--) {
@@ -3022,6 +3094,29 @@ 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;
    }

@@ -3030,6 +3125,16 @@ 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);
@@ -3045,6 +3150,11 @@ function onKeyUp (ev) {
    return handleKeyUp(ev);
 }

+function onInput (ev) {
+    updateForEvent(ev);
+    return handleInput(ev);
+}
+
 function cancelEvent(ev)
 {
    ev = ev ? ev : window.event;
@@ -3076,13 +3186,14 @@ function onMouseWheel(ev)
 }

 function onTouchStart(ev) {
-    event.preventDefault();
+    ev.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);
@@ -3090,7 +3201,7 @@ function onTouchStart(ev) {
        var isEmulated = 0;

        if (firstTouchDownId == null) {
-            firstTouchDownId = touch.identifier;
+            firstTouchDownId = touchId;
            isEmulated = 1;

            if (realSurfaceWithMouse != origId || id != surfaceWithMouse) {
@@ -3105,52 +3216,54 @@ function onTouchStart(ev) {
            }
        }

-        sendInput (BROADWAY_EVENT_TOUCH, [0, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [0, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
    }
 }

 function onTouchMove(ev) {
-    event.preventDefault();
+    ev.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 == touch.identifier) {
+        if (firstTouchDownId == touchId) {
            isEmulated = 1;
        }

-        sendInput (BROADWAY_EVENT_TOUCH, [1, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [1, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
    }
 }

 function onTouchEnd(ev) {
-    event.preventDefault();
+    ev.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 == touch.identifier) {
+        if (firstTouchDownId == touchId) {
            isEmulated = 1;
            firstTouchDownId = null;
        }

-        sendInput (BROADWAY_EVENT_TOUCH, [2, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [2, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
    }
 }

@@ -3167,11 +3280,11 @@ function setupDocument(document)
    document.onkeyup = onKeyUp;

    if (document.addEventListener) {
-      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);
+	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);
    } else if (document.attachEvent) {
      element.attachEvent("onmousewheel", onMouseWheel);
    }
@@ -3237,12 +3350,14 @@ function connect()
    };

    var iOS = /(iPad|iPhone|iPod)/g.test( navigator.userAgent );
-    if (iOS) {
+    if (iOS || isAndroidChrome) {
        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);
    }
 }
@@ -52,8 +52,7 @@ broadwayjs_h = custom_target('broadwayjs.h',
 )

 libgdk_broadway = static_library('gdk-broadway',
-  clienthtml_h, broadwayjs_h,
-  gdk_broadway_sources, gdkconfig, gdkenum_h,
+  sources: [ clienthtml_h, broadwayjs_h, gdk_broadway_sources, gdk_gen_headers ],
  include_directories: [confinc, gdkinc],
  c_args: [
    '-DGTK_COMPILATION',
@@ -122,6 +122,7 @@ 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" },
@@ -156,6 +156,9 @@ 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);
 }

@@ -253,6 +256,11 @@ 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;

@@ -281,6 +289,10 @@ 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;
 }

@@ -355,6 +367,45 @@ 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`
@@ -459,3 +510,22 @@ 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);
+}
@@ -51,6 +51,52 @@ GDK_AVAILABLE_IN_ALL
 GdkCursor*  gdk_cursor_new_from_name     (const char      *name,
                                          GdkCursor       *fallback);

+/**
+ * GdkCursorGetTestureCallback:
+ * @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
@@ -44,6 +44,10 @@ struct _GdkCursor
  GdkTexture *texture;
  int hotspot_x;
  int hotspot_y;
+
+  GdkCursorGetTextureCallback callback;
+  gpointer data;
+  GDestroyNotify destroy;
 };

 struct _GdkCursorClass
@@ -55,5 +59,13 @@ 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

@@ -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,
@@ -1559,13 +1559,14 @@ describe_egl_config (EGLDisplay egl_display,

  if (!eglGetConfigAttrib (egl_display, egl_config, EGL_DEPTH_SIZE, &depth))
    depth = 0;
+
  if (!eglGetConfigAttrib (egl_display, egl_config, EGL_STENCIL_SIZE, &stencil))
    stencil = 0;

-  return g_strdup_printf ("R%dG%dB%dA%d%s%s%s", red, green, blue, alpha,
+  return g_strdup_printf ("R%dG%dB%dA%d%s, depth %d, stencil %d", red, green, blue, alpha,
                          type == EGL_COLOR_COMPONENT_TYPE_FIXED_EXT ? "" : " float",
-                          depth > 0 ? ", depth buffer" : "",
-                          stencil > 0 ? ", stencil buffer" : "");
+                          depth,
+                          stencil);
 }

 gpointer
@@ -25,6 +25,7 @@
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdmabuffourccprivate.h"
 #include "gdkdmabufprivate.h"
+#include "gdkdmabuftexturebuilderprivate.h"
 #include "gdktextureprivate.h"
 #include <gdk/gdkglcontext.h>
 #include <gdk/gdkgltexturebuilder.h>
@@ -71,7 +72,10 @@ gdk_dmabuf_texture_dispose (GObject *object)
  GdkDmabufTexture *self = GDK_DMABUF_TEXTURE (object);

  if (self->destroy)
-    self->destroy (self->data);
+    {
+      self->destroy (self->data);
+      self->destroy = NULL;
+    }

  g_clear_object (&self->downloader);
  g_clear_object (&self->display);
@@ -25,6 +25,7 @@
 #include "gdkdisplay.h"
 #include "gdkenumtypes.h"
 #include "gdkdmabuftextureprivate.h"
+#include "gdkdmabuftexturebuilderprivate.h"

 #include <cairo-gobject.h>

@@ -948,22 +949,20 @@ 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.
 *
- * If the dmabuf is not supported by GTK, %NULL will be returned and @error will be 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.
 *
 * 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).
 *
- * 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.
+ * It is possible to call this function multiple times to create multiple textures,
+ * possibly with changing properties in between.
 *
 * Returns: (transfer full) (nullable): a newly built `GdkTexture` or `NULL`
 *   if the format is not supported
@@ -1004,3 +1003,19 @@ 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);
+    }
+}
@@ -0,0 +1,14 @@
+#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
+
@@ -7,8 +7,6 @@

 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,
@@ -744,3 +744,11 @@ 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));
+}
@@ -76,6 +76,7 @@ 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

@@ -59,7 +59,7 @@ typedef enum {
 * @get_current_image: return a `GdkPaintable` that does not change over
 *   time. This means the `GDK_PAINTABLE_STATIC_SIZE` and
 *   `GDK_PAINTABLE_STATIC_CONTENTS` flag are set.
- * @get_flags: Get the flags for this instance. See [enum@Gdk.PaintableFlags]
+ * @get_flags: Get the flags for this instance. See [flags@Gdk.PaintableFlags]
 *   for details.
 * @get_intrinsic_width: The preferred width for this object to be
 *   snapshot at or 0 if none. This is purely a hint. The object must still
@@ -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 rgba->alpha < ((float) 0x00ff / (float) 0xffff);
+  return _gdk_rgba_is_clear (rgba);
 }

 /**
@@ -115,9 +115,9 @@ gdk_rgba_is_clear (const GdkRGBA *rgba)
 * Returns: %TRUE if the @rgba is opaque
 */
 gboolean
-gdk_rgba_is_opaque (const GdkRGBA *rgba)
+(gdk_rgba_is_opaque) (const GdkRGBA *rgba)
 {
-  return rgba->alpha > ((float)0xff00 / (float)0xffff);
+  return _gdk_rgba_is_opaque (rgba);
 }

 #define SKIP_WHITESPACES(s) while (*(s) == ' ') (s)++;
@@ -368,21 +368,10 @@ 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)
 {
-  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;
+  return _gdk_rgba_equal (p1, p2);
 }

 /**
@@ -43,5 +43,34 @@
 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;
+}
+
 G_END_DECLS

@@ -48,6 +48,14 @@ 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)
 {
@@ -108,15 +116,41 @@ 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);
@@ -130,6 +164,15 @@ 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)
@@ -155,9 +198,17 @@ gdk_subsurface_attach (GdkSubsurface         *subsurface,
        }
    }

-  return GDK_SUBSURFACE_GET_CLASS (subsurface)->attach (subsurface, texture, source, dest, above, sibling);
+  return result;
 }

+/*< 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)
 {
@@ -168,6 +219,14 @@ 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)
 {
@@ -176,30 +235,138 @@ 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 (GdkSubsurface   *subsurface,
-                           graphene_rect_t *source)
+gdk_subsurface_get_source_rect (GdkSubsurface   *subsurface,
+                                graphene_rect_t *rect)
 {
  g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (source != NULL);
+  g_return_if_fail (rect != NULL);

-  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_source (subsurface, source);
+  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_source_rect (subsurface, rect);
 }

+/*< 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_dest (GdkSubsurface   *subsurface,
-                         graphene_rect_t *dest)
+gdk_subsurface_get_texture_rect (GdkSubsurface   *subsurface,
+                                 graphene_rect_t *rect)
 {
  g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (dest != NULL);
+  g_return_if_fail (rect != NULL);

-  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_dest (subsurface, dest);
+  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_texture_rect (subsurface, rect);
 }

+/*< 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), TRUE);
+  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);

  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);
+}
@@ -47,42 +47,68 @@ 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,
-                                    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);
+  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);
 };

-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);
-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);
+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,
+                                                    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

@@ -57,6 +57,9 @@ 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;
@@ -22,6 +22,7 @@
 #include <string.h>

 #include "gdkmacoscursor-private.h"
+#include "gdkcursorprivate.h"

@interface NSCursor()
 -(long long)_coreCursorType;
@@ -217,9 +218,25 @@ _gdk_macos_cursor_get_ns_cursor (GdkCursor *cursor)

      if (name == NULL)
        {
-          nscursor = create_cursor_from_texture (gdk_cursor_get_texture (cursor),
-                                                 gdk_cursor_get_hotspot_x (cursor),
-                                                 gdk_cursor_get_hotspot_y (cursor));
+          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);
+
          return nscursor;
        }
    }
@@ -161,7 +161,8 @@ void             _gdk_macos_display_send_event                     (GdkMacosDisp
 void             _gdk_macos_display_warp_pointer                   (GdkMacosDisplay *self,
                                                                    int              x,
                                                                    int              y);
-NSEvent         *_gdk_macos_display_get_nsevent                    (GdkEvent        *event);
+NSEvent         *_gdk_macos_display_get_matching_nsevent           (GdkEvent        *event);
+NSEvent         *_gdk_macos_display_get_exact_nsevent              (GdkEvent        *event);
 NSEvent         *_gdk_macos_display_get_last_nsevent               (void);
 GdkDrag         *_gdk_macos_display_find_drag                      (GdkMacosDisplay *self,
                                                                    NSInteger        sequence_number);
@@ -77,6 +77,9 @@ gdk_macos_display_get_setting (GdkDisplay  *display,
                               const char *setting,
                               GValue      *value)
 {
+  if (gdk_display_get_debug_flags (display) & GDK_DEBUG_DEFAULT_SETTINGS)
+    return FALSE;
+
  return _gdk_macos_display_get_setting (GDK_MACOS_DISPLAY (display), setting, value);
 }

@@ -991,17 +994,41 @@ _gdk_macos_display_warp_pointer (GdkMacosDisplay *self,
  CGWarpMouseCursorPosition ((CGPoint) { x, y });
 }

+/* Find the matching `NSEvent` for an `GdkEvent`. This function
+ * return the `NSEvent`, also for rewritten `GdkEvent`'s.
+ */
 NSEvent *
-_gdk_macos_display_get_nsevent (GdkEvent *event)
+_gdk_macos_display_get_matching_nsevent (GdkEvent *event)
 {
-  for (const GList *iter = event_map.head; iter; iter = iter->next)
+  for (GList *iter = event_map.head; iter; iter = iter->next)
    {
-      const GdkToNSEventMap *map = iter->data;
+      GdkToNSEventMap *map = iter->data;

      if (map->gdk_event->event_type == event->event_type &&
          map->gdk_event->device == event->device &&
          map->gdk_event->time == event->time)
-        return map->nsevent;
+        {
+          return map->nsevent;
+        }
+    }
+
+  return NULL;
+}
+
+/* Find the matching `NSEvent` for the original `GdkEvent`.
+ * If an event was rewritten, it returns `NULL`.
+ */
+NSEvent *
+_gdk_macos_display_get_exact_nsevent (GdkEvent *event)
+{
+  for (GList *iter = event_map.head; iter; iter = iter->next)
+    {
+      GdkToNSEventMap *map = iter->data;
+
+      if (map->gdk_event == event)
+        {
+          return map->nsevent;
+        }
    }

  return NULL;
@@ -738,7 +738,7 @@ gdk_macos_event_source_dispatch (GSource     *source,

      if (!handled)
        {
-          NSEvent *nsevent = _gdk_macos_display_get_nsevent (event);
+          NSEvent *nsevent = _gdk_macos_display_get_exact_nsevent (event);
          if (nsevent != NULL)
            [NSApp sendEvent: nsevent];
        }
@@ -61,7 +61,7 @@ gdk_macos_deps = [
 libgdk_c_args += ['-xobjective-c']

 libgdk_macos = static_library('gdk-macos',
-  gdk_macos_sources, gdkconfig, gdkenum_h,
+  sources: [ gdk_macos_sources, gdk_gen_headers ],
  include_directories: [ confinc, gdkinc, ],
  c_args: [ libgdk_c_args, common_cflags, ],
  link_with: [],
@@ -202,7 +202,13 @@ gdkwayland_inc = include_directories('wayland')
 wlinc = include_directories('.')
 win32rcinc = include_directories('win32/rc')

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

 gdk_deps = [
  libm,
@@ -278,7 +284,7 @@ if gdk_backends.length() == 0
 endif

 libgdk = static_library('gdk',
-  sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
+  sources: [gdk_sources, gdk_backends_gen_headers, gdk_gen_headers],
  dependencies: gdk_deps + [libgtk_css_dep],
  link_with: [libgtk_css],
  include_directories: [confinc, gdkx11_inc, wlinc],
@@ -290,7 +296,7 @@ libgdk = static_library('gdk',
 # list the dependencies and generated headers and such, for use in the
 # "public" libgtk_dep used by internal executables.
 libgdk_dep = declare_dependency(
-  sources: ['gdk.h', gdkconfig, gdkenum_h],
+  sources: ['gdk.h', gdk_gen_headers],
  include_directories: [confinc, gdkx11_inc, wlinc],
  dependencies: gdk_deps + [libgtk_css_dep],
 )
@@ -198,17 +198,8 @@ 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);

-  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);
+  gdk_wayland_surface_handle_empty_frame (surface);
 }

 static void
@@ -155,15 +155,19 @@ static const struct wl_buffer_listener buffer_listener = {
 struct wl_buffer *
 _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
                                GdkCursor         *cursor,
-                                guint              desired_scale,
+                                double             desired_scale,
+                                gboolean           use_viewporter,
                                guint              image_index,
                                int               *hotspot_x,
                                int               *hotspot_y,
                                int               *width,
                                int               *height,
-                                int               *scale)
+                                double            *scale)
 {
  GdkTexture *texture;
+  int desired_scale_factor;
+
+  desired_scale_factor = (int) ceil (desired_scale);

  if (gdk_cursor_get_name (cursor))
    {
@@ -174,7 +178,7 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,

      c = gdk_wayland_cursor_load_for_name (display,
                                            _gdk_wayland_display_get_cursor_theme (display),
-                                            desired_scale,
+                                            desired_scale_factor,
                                            gdk_cursor_get_name (cursor));
      if (c && c->image_count > 0)
        {
@@ -191,7 +195,7 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,

          image = c->images[image_index];

-          cursor_scale = desired_scale;
+          cursor_scale = desired_scale_factor;
          if ((image->width % cursor_scale != 0) ||
              (image->height % cursor_scale != 0))
            {
@@ -211,7 +215,7 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
          return wl_cursor_image_get_buffer (image);
        }
    }
-  else
+  else if (gdk_cursor_get_texture (cursor))
    {
      cairo_surface_t *surface;
      struct wl_buffer *buffer;
@@ -226,7 +230,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));
@@ -250,11 +254,50 @@ from_texture:

      return buffer;
    }
+  else
+    {
+      if (!use_viewporter)
+        *scale = desired_scale_factor;
+      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), 
+                                           gdk_cursor_get_fallback (cursor),
                                           desired_scale,
+                                           use_viewporter,
                                           image_index,
                                           hotspot_x, hotspot_y,
                                           width, height,
@@ -62,6 +62,7 @@ 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;
@@ -69,7 +70,7 @@ struct _GdkWaylandPointerData {
  guint cursor_image_delay;
  guint touchpad_event_sequence;

-  guint current_output_scale;
+  double current_output_scale;
  GSList *pointer_surface_outputs;

  /* Accumulated event data for a pointer frame */
@@ -182,6 +183,8 @@ struct _GdkWaylandSeat
  GdkWaylandPointerData pointer_info;
  GdkWaylandPointerData touch_info;

+  uint32_t latest_touch_down_serial;
+
  GdkModifierType key_modifiers;
  GdkSurface *keyboard_focus;
  GdkSurface *grab_surface;
@@ -260,18 +260,25 @@ 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, scale;
+  int x, y, w, h;
+  double 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);
    }
@@ -310,7 +317,16 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
  if (buffer)
    {
      wl_surface_attach (pointer->pointer_surface, buffer, 0, 0);
-      if (wl_surface_get_version (pointer->pointer_surface) >= WL_SURFACE_SET_BUFFER_SCALE_SINCE_VERSION)
+      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)
        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);
@@ -105,6 +105,9 @@
 #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)

@@ -310,7 +313,9 @@ 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 = *(dev_t *)device->data;
+  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));
 }
@@ -327,7 +332,9 @@ 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 = *(dev_t *)device->data;
+  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));
 }
@@ -437,7 +444,7 @@ gdk_registry_handle_global (void               *data,
    {
      display_wayland->compositor =
        wl_registry_bind (display_wayland->wl_registry, id,
-                          &wl_compositor_interface, MIN (version, 5));
+                          &wl_compositor_interface, MIN (version, 6));
    }
  else if (strcmp (interface, "wl_shm") == 0)
    {
@@ -606,7 +613,13 @@ 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));
@@ -817,6 +830,7 @@ 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->linux_dmabuf_feedback, zwp_linux_dmabuf_feedback_v1_destroy);
  if (display_wayland->linux_dmabuf_formats)
@@ -1122,7 +1136,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
@@ -1195,11 +1209,22 @@ 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;
@@ -1268,7 +1293,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);
@@ -1804,6 +1829,7 @@ 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 } },
@@ -1895,6 +1921,7 @@ 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:
@@ -2014,9 +2041,10 @@ init_settings (GdkDisplay *display)

      g_variant_get (ret, "(a{sa{sv}})", &iter);

-      if (g_variant_n_children (ret) == 0)
+      if (g_variant_iter_n_children (iter) == 0)
        {
          g_debug ("Received no portal settings");
+          g_clear_pointer (&iter, g_variant_iter_free);
          g_clear_pointer (&ret, g_variant_unref);

          goto fallback;
@@ -2143,6 +2171,9 @@ 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);
@@ -2193,6 +2224,11 @@ 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);
@@ -40,6 +40,7 @@
 #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 <glib.h>
 #include <gdk/gdkkeys.h>
@@ -127,6 +128,7 @@ 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;

@@ -88,14 +88,7 @@ gdk_wayland_gl_context_empty_frame (GdkDrawContext *draw_context)
 {
  GdkSurface *surface = gdk_draw_context_get_surface (draw_context);

-  if (gdk_wayland_surface_needs_commit (surface))
-    {
-      gdk_wayland_surface_sync (surface);
-      gdk_wayland_surface_request_frame (surface);
-
-      gdk_wayland_surface_commit (surface);
-      gdk_wayland_surface_notify_committed (surface);
-    }
+  gdk_wayland_surface_handle_empty_frame (surface);
 }

 static void
@@ -116,13 +116,14 @@ void       gdk_wayland_display_system_bell (GdkDisplay *display,

 struct wl_buffer *_gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
                                                  GdkCursor         *cursor,
-                                                  guint              desired_scale,
+                                                  double             desired_scale,
+                                                  gboolean           use_viewporter,
                                                  guint              image_index,
                                                  int               *hotspot_x,
                                                  int               *hotspot_y,
                                                  int               *w,
                                                  int               *h,
-                                                  int               *scale);
+                                                  double            *scale);
 guint      _gdk_wayland_cursor_get_next_image_index (GdkWaylandDisplay *display,
                                                     GdkCursor         *cursor,
                                                     guint              scale,
@@ -130,7 +131,7 @@ guint      _gdk_wayland_cursor_get_next_image_index (GdkWaylandDisplay *display,
                                                     guint             *next_image_delay);

 void            gdk_wayland_surface_sync                   (GdkSurface           *surface);
-gboolean        gdk_wayland_surface_needs_commit           (GdkSurface           *surface);
+void            gdk_wayland_surface_handle_empty_frame     (GdkSurface           *surface);
 void            gdk_wayland_surface_commit                 (GdkSurface           *surface);
 void            gdk_wayland_surface_notify_committed       (GdkSurface           *surface);
 void            gdk_wayland_surface_request_frame          (GdkSurface           *surface);
@@ -781,8 +781,8 @@ pointer_handle_motion (void              *data,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      g_message ("motion %f %f, seat %p state %d",
-                 x, y, seat, gdk_event_get_modifier_state (event));
+      gdk_debug_message ("motion %f %f, seat %p state %d",
+                         x, y, seat, gdk_event_get_modifier_state (event));
    }

  if (wl_seat_get_version (seat->wl_seat) < WL_POINTER_HAS_FRAME)
@@ -1640,6 +1640,7 @@ touch_handle_down (void              *data,
  touch->x = wl_fixed_to_double (x);
  touch->y = wl_fixed_to_double (y);
  touch->touch_down_serial = serial;
+  seat->latest_touch_down_serial = serial;

  event = gdk_touch_event_new (GDK_TOUCH_BEGIN,
                               GDK_SLOT_TO_EVENT_SEQUENCE (touch->id),
@@ -1663,7 +1664,7 @@ touch_handle_down (void              *data,
    {
      double xx, yy;
      gdk_event_get_position (event, &xx, &yy);
-      g_message ("touch begin %f %f", xx, yy);
+      gdk_debug_message ("touch begin %f %f", xx, yy);
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1698,7 +1699,7 @@ touch_handle_up (void            *data,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      g_message ("touch end %f %f", x, y);
+      gdk_debug_message ("touch end %f %f", x, y);
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1746,7 +1747,7 @@ touch_handle_motion (void            *data,
    {
      double xx, yy;
      gdk_event_get_position (event, &xx, &yy);
-      g_message ("touch update %f %f", xx, yy);
+      gdk_debug_message ("touch update %f %f", xx, yy);
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1840,9 +1841,9 @@ emit_gesture_swipe_event (GdkWaylandSeat          *seat,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      g_message ("swipe event %d, coords: %f %f, seat %p state %d",
-                 gdk_event_get_event_type (event), x, y, seat,
-                 gdk_event_get_modifier_state (event));
+      gdk_debug_message ("swipe event %d, coords: %f %f, seat %p state %d",
+                         gdk_event_get_event_type (event), x, y, seat,
+                         gdk_event_get_modifier_state (event));
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1935,10 +1936,10 @@ emit_gesture_pinch_event (GdkWaylandSeat          *seat,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      g_message ("pinch event %d, coords: %f %f, seat %p state %d",
-                       gdk_event_get_event_type (event),
-                       x, y, seat,
-                       gdk_event_get_modifier_state (event));
+      gdk_debug_message ("pinch event %d, coords: %f %f, seat %p state %d",
+                         gdk_event_get_event_type (event),
+                         x, y, seat,
+                         gdk_event_get_modifier_state (event));
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -2029,10 +2030,10 @@ emit_gesture_hold_event (GdkWaylandSeat          *seat,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      g_message ("hold event %d, coords: %f %f, seat %p state %d",
-                 gdk_event_get_event_type (event),
-                 x, y, seat,
-                 gdk_event_get_modifier_state (event));
+      gdk_debug_message ("hold event %d, coords: %f %f, seat %p state %d",
+                         gdk_event_get_event_type (event),
+                         x, y, seat,
+                         gdk_event_get_modifier_state (event));
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -3766,8 +3767,7 @@ pointer_surface_update_scale (GdkDevice *device)
  GdkWaylandDevice *wayland_device = GDK_WAYLAND_DEVICE (device);
  GdkWaylandPointerData *pointer =
    gdk_wayland_device_get_pointer (wayland_device);
-  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (seat->display);
-  guint32 scale;
+  double scale;
  GSList *l;

  if (wl_surface_get_version (pointer->pointer_surface) < WL_SURFACE_SET_BUFFER_SCALE_SINCE_VERSION)
@@ -3782,8 +3782,8 @@ pointer_surface_update_scale (GdkDevice *device)
  scale = 1;
  for (l = pointer->pointer_surface_outputs; l != NULL; l = l->next)
    {
-      guint32 output_scale = gdk_wayland_display_get_output_scale (display_wayland, l->data);
-      scale = MAX (scale, output_scale);
+      GdkMonitor *monitor = gdk_wayland_display_get_monitor_for_output (seat->display, l->data);
+      scale = MAX (scale, gdk_monitor_get_scale (monitor));
    }

  if (pointer->current_output_scale == scale)
@@ -3878,6 +3878,7 @@ gdk_wayland_pointer_data_finalize (GdkWaylandPointerData *pointer)
  g_clear_object (&pointer->cursor);
  wl_surface_destroy (pointer->pointer_surface);
  g_slist_free (pointer->pointer_surface_outputs);
+  g_clear_pointer (&pointer->pointer_surface_viewport, wp_viewport_destroy);
 }

 static void
@@ -4241,6 +4242,9 @@ init_pointer_data (GdkWaylandPointerData *pointer_data,
  wl_surface_add_listener (pointer_data->pointer_surface,
                           &pointer_surface_listener,
                           logical_device);
+
+  if (display_wayland->viewporter)
+    pointer_data->pointer_surface_viewport = wp_viewporter_get_viewport (display_wayland->viewporter, pointer_data->pointer_surface);
 }

 void
@@ -4390,15 +4394,24 @@ _gdk_wayland_seat_get_last_implicit_grab_serial (GdkWaylandSeat    *seat,
        serial = tablet->pointer_info.press_serial;
    }

-  while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &touch))
+  if (g_hash_table_size (seat->touches) > 0)
    {
-      if (touch->touch_down_serial > serial)
+      while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &touch))
        {
-          if (sequence)
-            *sequence = GDK_SLOT_TO_EVENT_SEQUENCE (touch->id);
-          serial = touch->touch_down_serial;
+          if (touch->touch_down_serial > serial)
+            {
+              if (sequence)
+                *sequence = GDK_SLOT_TO_EVENT_SEQUENCE (touch->id);
+              serial = touch->touch_down_serial;
+
+            }
        }
    }
+  else
+    {
+      if (seat->latest_touch_down_serial > serial)
+        serial = seat->latest_touch_down_serial;
+    }

  return serial;
 }
@@ -2,6 +2,7 @@

 #include "gdksubsurfaceprivate.h"

+#include "wayland-client-protocol.h"

 typedef struct _GdkWaylandSubsurface GdkWaylandSubsurface;
 typedef struct _GdkWaylandSubsurfaceClass GdkWaylandSubsurfaceClass;
@@ -23,10 +24,17 @@ struct _GdkWaylandSubsurface
  GdkTexture *texture;
  cairo_rectangle_int_t dest;
  graphene_rect_t source;
+  enum wl_output_transform transform;

  struct wl_region *opaque_region;

  struct wl_callback *frame_callback;
+
+  struct wl_surface *bg_surface;
+  struct wl_subsurface *bg_subsurface;
+  struct wp_viewport *bg_viewport;
+  cairo_rectangle_int_t bg_rect;
+  gboolean bg_attached;
 };

 struct _GdkWaylandSubsurfaceClass
@@ -25,6 +25,8 @@
 #include "gdkdmabuftextureprivate.h"
 #include "gdksurface-wayland-private.h"
 #include "gdksubsurfaceprivate.h"
+#include "gdkdebugprivate.h"
+#include "gsk/gskrectprivate.h"

 #include "linux-dmabuf-unstable-v1-client-protocol.h"

@@ -46,11 +48,55 @@ gdk_wayland_subsurface_finalize (GObject *object)
  g_clear_pointer (&self->viewport, wp_viewport_destroy);
  g_clear_pointer (&self->subsurface, wl_subsurface_destroy);
  g_clear_pointer (&self->surface, wl_surface_destroy);
-  g_clear_pointer (&self->subsurface, wl_subsurface_destroy);
+  g_clear_pointer (&self->bg_viewport, wp_viewport_destroy);
+  g_clear_pointer (&self->bg_subsurface, wl_subsurface_destroy);
+  g_clear_pointer (&self->bg_surface, wl_surface_destroy);

  G_OBJECT_CLASS (gdk_wayland_subsurface_parent_class)->finalize (object);
 }

+static void
+shm_buffer_release (void             *data,
+                    struct wl_buffer *buffer)
+{
+  cairo_surface_t *surface = data;
+
+  /* Note: the wl_buffer is destroyed as cairo user data */
+  cairo_surface_destroy (surface);
+}
+
+static const struct wl_buffer_listener shm_buffer_listener = {
+  shm_buffer_release,
+};
+
+static struct wl_buffer *
+get_shm_wl_buffer (GdkWaylandSubsurface *self,
+                   GdkTexture           *texture)
+{
+  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SUBSURFACE (self)->parent));
+  int width, height;
+  cairo_surface_t *surface;
+  GdkTextureDownloader *downloader;
+  struct wl_buffer *buffer;
+
+  width = gdk_texture_get_width (texture);
+  height = gdk_texture_get_height (texture);
+  surface = gdk_wayland_display_create_shm_surface (display, width, height, &GDK_FRACTIONAL_SCALE_INIT_INT (1));
+
+  downloader = gdk_texture_downloader_new (texture);
+
+  gdk_texture_downloader_download_into (downloader,
+                                        cairo_image_surface_get_data (surface),
+                                        cairo_image_surface_get_stride (surface));
+
+  gdk_texture_downloader_free (downloader);
+
+  buffer = _gdk_wayland_shm_surface_get_wl_buffer (surface);
+  wl_buffer_add_listener (buffer, &shm_buffer_listener, surface);
+
+  return buffer;
+}
+
 static void
 dmabuf_buffer_release (void             *data,
                       struct wl_buffer *buffer)
@@ -97,8 +143,8 @@ static const struct zwp_linux_buffer_params_v1_listener params_listener = {
 };

 static struct wl_buffer *
-get_wl_buffer (GdkWaylandSubsurface *self,
-               GdkTexture           *texture)
+get_dmabuf_wl_buffer (GdkWaylandSubsurface *self,
+                      GdkTexture           *texture)
 {
  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SUBSURFACE (self)->parent));
  const GdkDmabuf *dmabuf;
@@ -149,23 +195,138 @@ get_wl_buffer (GdkWaylandSubsurface *self,
  return buffer;
 }

+static struct wl_buffer *
+get_wl_buffer (GdkWaylandSubsurface *self,
+               GdkTexture           *texture)
+{
+  GdkDisplay *display = gdk_surface_get_display (GDK_SUBSURFACE (self)->parent);
+  struct wl_buffer *buffer = NULL;
+
+  if (GDK_IS_DMABUF_TEXTURE (texture))
+    buffer = get_dmabuf_wl_buffer (self, texture);
+
+  if (GDK_DISPLAY_DEBUG_CHECK (display, FORCE_OFFLOAD))
+    {
+      if (!buffer)
+         buffer = get_shm_wl_buffer (self, texture);
+    }
+
+  return buffer;
+}
+
+static void
+sp_buffer_release (void             *data,
+                   struct wl_buffer *buffer)
+{
+  wl_buffer_destroy (buffer);
+}
+
+static const struct wl_buffer_listener sp_buffer_listener = {
+  sp_buffer_release,
+};
+
+static struct wl_buffer *
+get_sp_buffer (GdkWaylandSubsurface *self)
+{
+  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SUBSURFACE (self)->parent));
+  struct wl_buffer *buffer = NULL;
+
+  if (display->single_pixel_buffer)
+    buffer = wp_single_pixel_buffer_manager_v1_create_u32_rgba_buffer (display->single_pixel_buffer,
+                                                                       0, 0, 0, 0xffffffffU);
+
+  if (buffer)
+    wl_buffer_add_listener (buffer, &sp_buffer_listener, self);
+
+  return buffer;
+}
+
+static inline enum wl_output_transform
+gdk_texture_transform_to_wl (GdkTextureTransform transform)
+{
+  return (enum wl_output_transform) transform;
+}
+
+static inline GdkTextureTransform
+wl_output_transform_to_gdk (enum wl_output_transform transform)
+{
+  return (GdkTextureTransform) transform;
+}
+
+static void
+ensure_bg_surface (GdkWaylandSubsurface *self)
+{
+  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (GDK_SUBSURFACE (self)->parent);
+  GdkDisplay *display = gdk_surface_get_display (GDK_SUBSURFACE (self)->parent);
+  GdkWaylandDisplay *disp = GDK_WAYLAND_DISPLAY (display);
+  struct wl_region *region;
+
+  if (self->bg_surface)
+    return;
+
+  self->bg_surface = wl_compositor_create_surface (disp->compositor);
+  self->bg_subsurface = wl_subcompositor_get_subsurface (disp->subcompositor,
+                                                         self->bg_surface,
+                                                         impl->display_server.wl_surface);
+  self->bg_viewport = wp_viewporter_get_viewport (disp->viewporter, self->bg_surface);
+
+  /* We are opaque */
+  wl_surface_set_opaque_region (self->bg_surface, self->opaque_region);
+
+  /* No input, please */
+  region = wl_compositor_create_region (disp->compositor);
+  wl_surface_set_input_region (self->bg_surface, region);
+  wl_region_destroy (region);
+}
+
+static inline gboolean
+scaled_rect_is_integral (const graphene_rect_t *rect,
+                         float                  scale,
+                         graphene_rect_t       *device_rect)
+{
+  cairo_rectangle_int_t device_int;
+
+  gsk_rect_scale (rect, scale, scale, device_rect);
+
+  device_int.x = device_rect->origin.x;
+  device_int.y = device_rect->origin.y;
+  device_int.width = device_rect->size.width;
+  device_int.height = device_rect->size.height;
+
+  return device_int.x == device_rect->origin.x &&
+         device_int.y == device_rect->origin.y &&
+         device_int.width == device_rect->size.width &&
+         device_int.height == device_rect->size.height;
+}
+
 static gboolean
 gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
                               GdkTexture            *texture,
                               const graphene_rect_t *source,
                               const graphene_rect_t *dest,
+                               GdkTextureTransform    transform,
+                               const graphene_rect_t *background,
                               gboolean               above,
                               GdkSubsurface         *sibling)
 {
  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);
  GdkWaylandSurface *parent = GDK_WAYLAND_SURFACE (sub->parent);
+  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (sub->parent));
  struct wl_buffer *buffer = NULL;
  gboolean result = FALSE;
  GdkWaylandSubsurface *sib = sibling ? GDK_WAYLAND_SUBSURFACE (sibling) : NULL;
  gboolean will_be_above;
  double scale;
  graphene_rect_t device_rect;
-  cairo_rectangle_int_t device_dest;
+  gboolean has_background;
+  enum wl_output_transform tf;
+  gboolean dest_changed = FALSE;
+  gboolean source_changed = FALSE;
+  gboolean transform_changed = FALSE;
+  gboolean stacking_changed = FALSE;
+  gboolean needs_commit = FALSE;
+  gboolean background_changed = FALSE;
+  gboolean needs_bg_commit = FALSE;

  if (sibling)
    will_be_above = sibling->above_parent;
@@ -178,69 +339,133 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
      return FALSE;
    }

-  self->dest.x = dest->origin.x;
-  self->dest.y = dest->origin.y;
-  self->dest.width = dest->size.width;
-  self->dest.height = dest->size.height;
-
-  self->source.origin.x = source->origin.x;
-  self->source.origin.y = source->origin.y;
-  self->source.size.width = source->size.width;
-  self->source.size.height = source->size.height;
-
-  scale = gdk_fractional_scale_to_double (&parent->scale);
-
-  device_rect.origin.x = dest->origin.x * scale;
-  device_rect.origin.y = dest->origin.y * scale;
-  device_rect.size.width = dest->size.width * scale;
-  device_rect.size.height = dest->size.height * scale;
-
-  device_dest.x = device_rect.origin.x;
-  device_dest.y = device_rect.origin.y;
-  device_dest.width = device_rect.size.width;
-  device_dest.height = device_rect.size.height;
-
  if (self->dest.x != dest->origin.x ||
      self->dest.y != dest->origin.y ||
      self->dest.width != dest->size.width ||
      self->dest.height != dest->size.height)
+    {
+      self->dest.x = dest->origin.x;
+      self->dest.y = dest->origin.y;
+      self->dest.width = dest->size.width;
+      self->dest.height = dest->size.height;
+      dest_changed = TRUE;
+    }
+
+  if (!gsk_rect_equal (&self->source, source))
+    {
+      self->source.origin.x = source->origin.x;
+      self->source.origin.y = source->origin.y;
+      self->source.size.width = source->size.width;
+      self->source.size.height = source->size.height;
+      source_changed = TRUE;
+    }
+
+  tf = gdk_texture_transform_to_wl (transform);
+  if (self->transform != tf)
+    {
+      self->transform = tf;
+      transform_changed = TRUE;
+    }
+
+  if (sibling != gdk_subsurface_get_sibling (sub, above) ||
+      will_be_above != gdk_subsurface_is_above_parent (sub))
+    stacking_changed = TRUE;
+
+  if (self->texture == NULL)
+    {
+      dest_changed = TRUE;
+      source_changed = TRUE;
+      transform_changed = TRUE;
+      stacking_changed = TRUE;
+    }
+
+  scale = gdk_fractional_scale_to_double (&parent->scale);
+
+  if (background)
+    {
+      background_changed =
+          !self->bg_attached ||
+          self->bg_rect.x != background->origin.x ||
+          self->bg_rect.y != background->origin.y ||
+          self->bg_rect.width != background->size.width ||
+          self->bg_rect.height != background->size.height;
+      self->bg_rect.x = background->origin.x;
+      self->bg_rect.y = background->origin.y;
+      self->bg_rect.width = background->size.width;
+      self->bg_rect.height = background->size.height;
+    }
+  else
+    {
+      background_changed = self->bg_attached;
+      self->bg_rect.x = 0;
+      self->bg_rect.y = 0;
+      self->bg_rect.width = 0;
+      self->bg_rect.height = 0;
+    }
+
+  has_background = self->bg_rect.width > 0 && self->bg_rect.height > 0;
+
+  if (has_background)
+    ensure_bg_surface (self);
+
+  if (!scaled_rect_is_integral (dest, 1, &device_rect))
    {
      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "Non-integer coordinates %g %g %g %g for %dx%d texture, hiding subsurface %p",
+                         "[%p] 🗙 Non-integral coordinates %g %g %g %g",
+                         self,
                         dest->origin.x, dest->origin.y,
-                         dest->size.width, dest->size.height,
-                         gdk_texture_get_width (texture),
-                         gdk_texture_get_height (texture),
-                         self);
+                         dest->size.width, dest->size.height);
    }
-  else if (device_dest.x != device_rect.origin.x ||
-           device_dest.y != device_rect.origin.y ||
-           device_dest.width != device_rect.size.width ||
-           device_dest.height != device_rect.size.height)
+  else if (!scaled_rect_is_integral (dest, scale, &device_rect))
    {
      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "Non-integral device coordinates %g %g %g %g (fractional scale %.2f), hiding subsurface %p",
+                         "[%p] 🗙 Non-integral device coordinates %g %g %g %g (scale %.2f)",
+                         self,
                         device_rect.origin.x, device_rect.origin.y,
-                         device_rect.size.width, device_rect.size.width,
-                         scale,
-                         self);
+                         device_rect.size.width, device_rect.size.height,
+                         scale);
    }
-  else if (!GDK_IS_DMABUF_TEXTURE (texture))
+  else if (background && !scaled_rect_is_integral (background, 1, &device_rect))
    {
      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "%dx%d %s is not a GdkDmabufTexture, hiding subsurface %p",
-                         gdk_texture_get_width (texture),
-                         gdk_texture_get_height (texture),
+                         "[%p] 🗙 Non-integral background coordinates %g %g %g %g",
+                         self,
+                         background->origin.x, background->origin.y,
+                         background->size.width, background->size.height);
+    }
+  else if (background && !scaled_rect_is_integral (background, scale, &device_rect))
+    {
+      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
+                         "[%p] 🗙 Non-integral background device coordinates %g %g %g %g (scale %.2f)",
+                         self,
+                         device_rect.origin.x, device_rect.origin.y,
+                         device_rect.size.width, device_rect.size.height,
+                         scale);
+    }
+  else if (!GDK_IS_DMABUF_TEXTURE (texture) &&
+           !GDK_DISPLAY_DEBUG_CHECK (gdk_surface_get_display (sub->parent), FORCE_OFFLOAD))
+    {
+      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
+                         "[%p] 🗙 %s (%dx%d) is not a GdkDmabufTexture",
+                         self,
                         G_OBJECT_TYPE_NAME (texture),
-                         self);
+                         gdk_texture_get_width (texture),
+                         gdk_texture_get_height (texture));
    }
  else if (!will_be_above &&
-           gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_OPAQUE)
+           gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_OPAQUE &&
+           !has_background)
    {
      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "Cannot offload non-opaque %dx%d texture below, hiding subsurface %p",
+                         "[%p] 🗙 Non-opaque texture (%dx%d) below",
+                         self,
                         gdk_texture_get_width (texture),
-                         gdk_texture_get_height (texture),
+                         gdk_texture_get_height (texture));
+    }
+  else if (has_background && !display->single_pixel_buffer)
+    {
+      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
+                         "[%p] 🗙 Texture has background, but no single-pixel buffer support",
                         self);
    }
  else
@@ -269,10 +494,13 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
                }

              GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                                 "Attached %dx%d texture to subsurface %p at %d %d %d %d",
+                                 "[%p] %s Attaching texture (%dx%d) at %d %d %d %d",
+                                 self,
+                                 will_be_above
+                                   ? (has_background ? "▲" : "△")
+                                   : (has_background ? "▼" : "▽"),
                                 gdk_texture_get_width (texture),
                                 gdk_texture_get_height (texture),
-                                 self,
                                 self->dest.x, self->dest.y,
                                 self->dest.width, self->dest.height);
              result = TRUE;
@@ -280,35 +508,53 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
          else
            {
              GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                                 "Compositor failed to create wl_buffer for %dx%d texture, hiding subsurface %p",
-                                 gdk_texture_get_width (texture),
-                                 gdk_texture_get_height (texture),
+                                 "[%p] 🗙 Failed to create wl_buffer",
                                 self);
            }
        }
      else
        {
+          if (dest_changed)
+            GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
+                               "[%p] %s Moving texture (%dx%d) to %d %d %d %d",
+                               self,
+                               will_be_above
+                                 ? (has_background ? "▲" : "△")
+                                 : (has_background ? "▼" : "▽"),
+                               gdk_texture_get_width (texture),
+                               gdk_texture_get_height (texture),
+                               self->dest.x, self->dest.y,
+                               self->dest.width, self->dest.height);
+
          buffer = NULL;
-          GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                             "Moved %dx%d texture in subsurface %p to %d %d %d %d",
-                             gdk_texture_get_width (texture),
-                             gdk_texture_get_height (texture),
-                             self,
-                             self->dest.x, self->dest.y,
-                             self->dest.width, self->dest.height);
          result = TRUE;
        }
    }

  if (result)
    {
-      wl_subsurface_set_position (self->subsurface, self->dest.x, self->dest.y);
-      wp_viewport_set_destination (self->viewport, self->dest.width, self->dest.height);
-      wp_viewport_set_source (self->viewport,
-                              wl_fixed_from_double (self->source.origin.x),
-                              wl_fixed_from_double (self->source.origin.y),
-                              wl_fixed_from_double (self->source.size.width),
-                              wl_fixed_from_double (self->source.size.height));
+      if (transform_changed)
+        {
+          wl_surface_set_buffer_transform (self->surface, self->transform);
+          needs_commit = TRUE;
+        }
+
+      if (dest_changed)
+        {
+          wl_subsurface_set_position (self->subsurface, self->dest.x, self->dest.y);
+          wp_viewport_set_destination (self->viewport, self->dest.width, self->dest.height);
+          needs_commit = TRUE;
+        }
+
+      if (source_changed)
+        {
+          wp_viewport_set_source (self->viewport,
+                                  wl_fixed_from_double (self->source.origin.x),
+                                  wl_fixed_from_double (self->source.origin.y),
+                                  wl_fixed_from_double (self->source.size.width),
+                                  wl_fixed_from_double (self->source.size.height));
+          needs_commit = TRUE;
+        }

      if (buffer)
        {
@@ -317,39 +563,95 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
                                    0, 0,
                                    gdk_texture_get_width (texture),
                                    gdk_texture_get_height (texture));
+          needs_commit = TRUE;
+        }

+      if (has_background)
+        {
+          if (background_changed)
+            {
+              wl_subsurface_set_position (self->bg_subsurface, self->bg_rect.x, self->bg_rect.y);
+              wp_viewport_set_destination (self->bg_viewport, self->bg_rect.width, self->bg_rect.height);
+              needs_bg_commit = TRUE;
+            }
+
+          if (!self->bg_attached)
+            {
+              self->bg_attached = TRUE;
+
+              wp_viewport_set_source (self->bg_viewport,
+                                      wl_fixed_from_int (0),
+                                      wl_fixed_from_int (0),
+                                      wl_fixed_from_int (1),
+                                      wl_fixed_from_int (1));
+              wl_surface_attach (self->bg_surface, get_sp_buffer (self), 0, 0);
+              wl_surface_damage_buffer (self->bg_surface, 0, 0, 1, 1);
+              needs_bg_commit = TRUE;
+            }
+        }
+      else
+        {
+          if (self->bg_attached)
+            {
+              self->bg_attached = FALSE;
+              wl_surface_attach (self->bg_surface, NULL, 0, 0);
+              needs_bg_commit = TRUE;
+            }
        }

      result = TRUE;
    }
  else
    {
-      g_set_object (&self->texture, NULL);
+      if (g_set_object (&self->texture, NULL))
+        {
+          wl_surface_attach (self->surface, NULL, 0, 0);
+          needs_commit = TRUE;
+        }

-      wl_surface_attach (self->surface, NULL, 0, 0);
+      if (self->bg_attached)
+        {
+          self->bg_attached = FALSE;
+          wl_surface_attach (self->bg_surface, NULL, 0, 0);
+          needs_bg_commit = TRUE;
+        }
    }

-  if (sib)
+  if (stacking_changed)
    {
-      if (above)
-        wl_subsurface_place_above (self->subsurface, sib->surface);
+      if (sib)
+        {
+          if (above)
+            wl_subsurface_place_above (self->subsurface, sib->surface);
+          else
+            wl_subsurface_place_below (self->subsurface, sib->surface);
+        }
      else
-        wl_subsurface_place_below (self->subsurface, sib->surface);
-    }
-  else
-    {
-      if (above)
-        wl_subsurface_place_above (self->subsurface,
-                                   GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
-      else
-        wl_subsurface_place_below (self->subsurface,
-                                   GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
+        {
+          if (above)
+            wl_subsurface_place_above (self->subsurface,
+                                       GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
+          else
+            wl_subsurface_place_below (self->subsurface,
+                                       GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
+        }
+      needs_commit = TRUE;
+
+      if (self->bg_attached)
+        {
+          wl_subsurface_place_below (self->bg_subsurface, self->surface);
+          needs_bg_commit = TRUE;
+        }
    }

-  wl_surface_commit (self->surface);
+  if (needs_commit)
+    wl_surface_commit (self->surface);

-  ((GdkWaylandSurface *)sub->parent)->has_pending_subsurface_commits = TRUE;
-  GDK_WAYLAND_SURFACE (sub->parent)->opaque_region_dirty = TRUE;
+  if (needs_bg_commit)
+    wl_surface_commit (self->bg_surface);
+
+  ((GdkWaylandSurface *)sub->parent)->has_pending_subsurface_commits = needs_commit || needs_bg_commit;
+  GDK_WAYLAND_SURFACE (sub->parent)->opaque_region_dirty = stacking_changed || dest_changed || background_changed;

  return result;
 }
@@ -361,7 +663,7 @@ gdk_wayland_subsurface_detach (GdkSubsurface *sub)

  if (sub->parent == NULL)
    {
-      g_warning ("Can't draw to destroyed subsurface %p", self);
+      g_warning ("Can't detach from destroyed subsurface %p", self);
      return;
    }

@@ -370,6 +672,13 @@ gdk_wayland_subsurface_detach (GdkSubsurface *sub)
  wl_surface_set_opaque_region (self->surface, self->opaque_region);
  wl_surface_commit (self->surface);

+  if (self->bg_attached)
+    {
+      wl_surface_attach (self->bg_surface, NULL, 0, 0);
+      wl_surface_commit (self->bg_surface);
+      self->bg_attached = FALSE;
+    }
+
  ((GdkWaylandSurface *)sub->parent)->has_pending_subsurface_commits = TRUE;
  GDK_WAYLAND_SURFACE (sub->parent)->opaque_region_dirty = TRUE;
 }
@@ -383,27 +692,49 @@ gdk_wayland_subsurface_get_texture (GdkSubsurface *sub)
 }

 static void
-gdk_wayland_subsurface_get_dest (GdkSubsurface   *sub,
-                                 graphene_rect_t *dest)
+gdk_wayland_subsurface_get_texture_rect (GdkSubsurface   *sub,
+                                         graphene_rect_t *rect)
 {
  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);

-  dest->origin.x = self->dest.x;
-  dest->origin.y = self->dest.y;
-  dest->size.width = self->dest.width;
-  dest->size.height = self->dest.height;
+  rect->origin.x = self->dest.x;
+  rect->origin.y = self->dest.y;
+  rect->size.width = self->dest.width;
+  rect->size.height = self->dest.height;
 }

 static void
-gdk_wayland_subsurface_get_source (GdkSubsurface   *sub,
-                                   graphene_rect_t *source)
+gdk_wayland_subsurface_get_source_rect (GdkSubsurface   *sub,
+                                        graphene_rect_t *rect)
 {
  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);

-  source->origin.x = self->source.origin.x;
-  source->origin.y = self->source.origin.y;
-  source->size.width = self->source.size.width;
-  source->size.height = self->source.size.height;
+  rect->origin.x = self->source.origin.x;
+  rect->origin.y = self->source.origin.y;
+  rect->size.width = self->source.size.width;
+  rect->size.height = self->source.size.height;
+}
+
+static GdkTextureTransform
+gdk_wayland_subsurface_get_transform (GdkSubsurface *sub)
+{
+  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);
+
+  return wl_output_transform_to_gdk (self->transform);
+}
+
+static gboolean
+gdk_wayland_subsurface_get_background_rect (GdkSubsurface   *sub,
+                                            graphene_rect_t *rect)
+{
+  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);
+
+  rect->origin.x = self->bg_rect.x;
+  rect->origin.y = self->bg_rect.y;
+  rect->size.width = self->bg_rect.width;
+  rect->size.height = self->bg_rect.height;
+
+  return rect->size.width > 0 && rect->size.height > 0;
 }

 static void
@@ -417,8 +748,10 @@ gdk_wayland_subsurface_class_init (GdkWaylandSubsurfaceClass *class)
  subsurface_class->attach = gdk_wayland_subsurface_attach;
  subsurface_class->detach = gdk_wayland_subsurface_detach;
  subsurface_class->get_texture = gdk_wayland_subsurface_get_texture;
-  subsurface_class->get_source = gdk_wayland_subsurface_get_source;
-  subsurface_class->get_dest = gdk_wayland_subsurface_get_dest;
+  subsurface_class->get_source_rect = gdk_wayland_subsurface_get_source_rect;
+  subsurface_class->get_texture_rect = gdk_wayland_subsurface_get_texture_rect;
+  subsurface_class->get_transform = gdk_wayland_subsurface_get_transform;
+  subsurface_class->get_background_rect = gdk_wayland_subsurface_get_background_rect;
 };

 static void
@@ -54,6 +54,8 @@
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
 #include "presentation-time-client-protocol.h"

+#include "gsk/gskrectprivate.h"
+

 /**
 * GdkWaylandSurface:
@@ -271,6 +273,20 @@ gdk_wayland_surface_update_size (GdkSurface               *surface,
  _gdk_surface_update_size (surface);
 }

+static void
+gdk_wayland_surface_clear_frame_callback (GdkWaylandSurface *self)
+{
+  GdkSurface *surface = GDK_SURFACE (self);
+
+  g_clear_pointer (&self->frame_callback, wl_callback_destroy);
+
+  for (gsize i = 0; i < gdk_surface_get_n_subsurfaces (surface); i++)
+    {
+      GdkSubsurface *subsurface = gdk_surface_get_subsurface (surface, i);
+      gdk_wayland_subsurface_clear_frame_callback (subsurface);
+    }
+}
+
 void
 gdk_wayland_surface_frame_callback (GdkSurface *surface,
                                    uint32_t    time)
@@ -284,13 +300,7 @@ gdk_wayland_surface_frame_callback (GdkSurface *surface,
  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland frame event", NULL);
  GDK_DISPLAY_DEBUG (GDK_DISPLAY (display_wayland), EVENTS, "frame %p", surface);

-  g_clear_pointer (&impl->frame_callback, wl_callback_destroy);
-
-  for (gsize i = 0; i < gdk_surface_get_n_subsurfaces (surface); i++)
-    {
-      GdkSubsurface *subsurface = gdk_surface_get_subsurface (surface, i);
-      gdk_wayland_subsurface_clear_frame_callback (subsurface);
-    }
+  gdk_wayland_surface_clear_frame_callback (impl);

  GDK_WAYLAND_SURFACE_GET_CLASS (impl)->handle_frame (impl);

@@ -649,6 +659,7 @@ static void
 gdk_wayland_surface_sync_opaque_region (GdkSurface *surface)
 {
  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
+  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
  struct wl_region *wl_region = NULL;

  if (!impl->display_server.wl_surface)
@@ -671,16 +682,21 @@ gdk_wayland_surface_sync_opaque_region (GdkSurface *surface)
                continue;

              if (sub->texture != NULL)
-                cairo_region_subtract_rectangle (region, &sub->dest);
+                {
+                  graphene_rect_t bounds;
+                  cairo_rectangle_int_t rect;
+
+                  gdk_subsurface_get_bounds (subsurface, &bounds);
+                  gsk_rect_to_cairo_grow (&bounds, &rect);
+                  cairo_region_subtract_rectangle (region, &rect);
+                }
            }

-          wl_region = wl_region_from_cairo_region (GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface)),
-                                                   region);
+          wl_region = wl_region_from_cairo_region (display, region);
          cairo_region_destroy (region);
        }
      else
-        wl_region = wl_region_from_cairo_region (GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface)),
-                                                 impl->opaque_region);
+        wl_region = wl_region_from_cairo_region (display, impl->opaque_region);
    }

  wl_surface_set_opaque_region (impl->display_server.wl_surface, wl_region);
@@ -767,7 +783,7 @@ gdk_wayland_surface_sync (GdkSurface *surface)
  gdk_wayland_surface_sync_viewport (surface);
 }

-gboolean
+static gboolean
 gdk_wayland_surface_needs_commit (GdkSurface *surface)
 {
  GdkWaylandSurface *self = GDK_WAYLAND_SURFACE (surface);
@@ -779,6 +795,20 @@ gdk_wayland_surface_needs_commit (GdkSurface *surface)
         self->viewport_dirty;
 }

+void
+gdk_wayland_surface_handle_empty_frame (GdkSurface *surface)
+{
+  if (!gdk_wayland_surface_needs_commit (surface))
+    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_surface_fractional_scale_preferred_scale_cb (void *data,
                                                         struct wp_fractional_scale_v1 *fractional_scale,
@@ -791,6 +821,11 @@ gdk_wayland_surface_fractional_scale_preferred_scale_cb (void *data,
  gdk_wayland_surface_update_size (surface,
                                   surface->width, surface->height,
                                   &GDK_FRACTIONAL_SCALE_INIT (scale));
+
+  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
+                     "preferred fractional scale, surface %p scale %f",
+                     surface,
+                     gdk_fractional_scale_to_double (&GDK_FRACTIONAL_SCALE_INIT (scale)));
 }

 static const struct wp_fractional_scale_v1_listener fractional_scale_listener = {
@@ -807,8 +842,8 @@ surface_enter (void              *data,
  GdkDisplay *display = gdk_surface_get_display (surface);
  GdkMonitor *monitor;

-  GDK_DISPLAY_DEBUG(gdk_surface_get_display (surface), EVENTS,
-                    "surface enter, surface %p output %p", surface, output);
+  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
+                     "surface enter, surface %p output %p", surface, output);

  impl->display_server.outputs = g_slist_prepend (impl->display_server.outputs, output);

@@ -840,9 +875,38 @@ surface_leave (void              *data,
  gdk_surface_leave_monitor (surface, monitor);
 }

+static void
+surface_preferred_buffer_scale (void              *data,
+                                struct wl_surface *wl_surface,
+                                int32_t            factor)
+{
+  GdkSurface *surface = GDK_SURFACE (data);
+
+  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
+                     "preferred buffer scale, surface %p scale %d",
+                     surface, factor);
+}
+
+static void
+surface_preferred_buffer_transform (void              *data,
+                                    struct wl_surface *wl_surface,
+                                    uint32_t           transform)
+{
+  GdkSurface *surface = GDK_SURFACE (data);
+  const char *transform_name[] = {
+    "normal", "90", "180", "270", "flipped", "flipped-90", "flipped-180", "flipped-270"
+  };
+
+  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
+                     "preferred buffer transform, surface %p transform %s",
+                     surface, transform_name[transform]);
+}
+
 static const struct wl_surface_listener surface_listener = {
  surface_enter,
-  surface_leave
+  surface_leave,
+  surface_preferred_buffer_scale,
+  surface_preferred_buffer_transform,
 };

 static void
@@ -1061,7 +1125,7 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
  unmap_popups_for_surface (surface);

  g_clear_pointer (&impl->presentation_time, gdk_wayland_presentation_time_free);
-  g_clear_pointer (&impl->frame_callback, wl_callback_destroy);
+  gdk_wayland_surface_clear_frame_callback (impl);
  if (impl->awaiting_frame_frozen)
    {
      impl->awaiting_frame_frozen = FALSE;
@@ -77,16 +77,8 @@ static void
 gdk_vulkan_context_wayland_empty_frame (GdkDrawContext *context)
 {
  GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (context));
-  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);

-  if (!impl->has_pending_subsurface_commits)
-    return;
-
-  gdk_wayland_surface_sync (surface);
-  gdk_wayland_surface_request_frame (surface);
-
-  gdk_wayland_surface_commit (surface);
-  gdk_wayland_surface_notify_committed (surface);
+  gdk_wayland_surface_handle_empty_frame (surface);
 }

 static void
@@ -48,7 +48,7 @@ GDK_AVAILABLE_IN_ALL
 struct wl_display      *gdk_wayland_display_get_wl_display      (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 struct wl_compositor   *gdk_wayland_display_get_wl_compositor   (GdkDisplay *display);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_16
 void                    gdk_wayland_display_set_cursor_theme    (GdkDisplay  *display,
                                                                 const char *name,
                                                                 int          size);
@@ -60,7 +60,7 @@ void                    gdk_wayland_display_set_startup_notification_id (GdkDisp

 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_wayland_display_query_registry      (GdkDisplay  *display,
-								 const char *global);
+                                                                 const char *global);

 GDK_AVAILABLE_IN_4_4
 gpointer                gdk_wayland_display_get_egl_display     (GdkDisplay  *display);
@@ -47,82 +47,40 @@ gdk_wayland_deps = [
  wlegldep,
 ]

-wayland_scanner = find_program('wayland-scanner')
-
-# Format:
-#  - protocol name
-#  - protocol stability ('private', 'stable' or 'unstable')
-#  - protocol version (if stability is 'unstable')
+wlmod = import('unstable-wayland')
 proto_sources = [
-  ['gtk-shell', 'private', ],
-  ['primary-selection', 'unstable', 'v1', ],
-  ['pointer-gestures', 'unstable', 'v1', ],
-  ['viewporter', 'stable', ],
-  ['xdg-shell', 'unstable', 'v6', ],
-  ['xdg-shell', 'stable', ],
-  ['xdg-foreign', 'unstable', 'v1', ],
-  ['xdg-foreign', 'unstable', 'v2', ],
-  ['tablet', 'unstable', 'v2', ],
-  ['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
-  ['server-decoration', 'private' ],
-  ['xdg-output', 'unstable', 'v1', ],
-  ['idle-inhibit', 'unstable', 'v1', ],
-  ['xdg-activation', 'staging', 'v1', ],
-  ['fractional-scale', 'staging', 'v1', ],
-  ['linux-dmabuf', 'unstable', 'v1', ],
-  ['presentation-time', 'stable', 'v1', ],
+  'protocol/gtk-shell.xml',
+  'protocol/server-decoration.xml',
+  wlmod.find_protocol('primary-selection', state: 'unstable', version: 1),
+  wlmod.find_protocol('pointer-gestures', state: 'unstable', version: 1),
+  wlmod.find_protocol('viewporter', state: 'stable'),
+  wlmod.find_protocol('xdg-shell', state: 'unstable', version: 6),
+  wlmod.find_protocol('xdg-shell', state: 'stable'),
+  wlmod.find_protocol('xdg-foreign', state: 'unstable', version: 1),
+  wlmod.find_protocol('xdg-foreign', state: 'unstable', version: 2),
+  wlmod.find_protocol('tablet', state: 'unstable', version: 2),
+  wlmod.find_protocol('keyboard-shortcuts-inhibit', state: 'unstable', version: 1),
+  wlmod.find_protocol('xdg-output', state: 'unstable', version: 1),
+  wlmod.find_protocol('idle-inhibit', state: 'unstable', version: 1),
+  wlmod.find_protocol('xdg-activation', state: 'staging', version: 1),
+  wlmod.find_protocol('fractional-scale', state: 'staging', version: 1),
+  wlmod.find_protocol('linux-dmabuf', state: 'unstable', version: 1),
+  wlmod.find_protocol('presentation-time', state: 'stable'),
+  wlmod.find_protocol('single-pixel-buffer', state: 'staging', version: 1),
 ]

 gdk_wayland_gen_headers = []

 foreach p: proto_sources
-  proto_name = p.get(0)
-  proto_stability = p.get(1)
-
-  if proto_stability == 'stable'
-    output_base = proto_name
-    input = files(join_paths(wlproto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base)))
-  elif proto_stability == 'staging'
-    proto_version = p.get(2)
-    output_base = '@0@-@1@'.format(proto_name, proto_version)
-    input = files(join_paths(wlproto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base)))
-  elif proto_stability == 'private'
-    output_base = proto_name
-    input = files('protocol/@0@.xml'.format(proto_name))
-  else
-    proto_version = p.get(2)
-    output_base = '@0@-@1@-@2@'.format(proto_name, proto_stability, proto_version)
-    input = files(join_paths(wlproto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base)))
-  endif
-
-  gdk_wayland_gen_headers += custom_target('@0@ client header'.format(output_base),
-    input: input,
-    output: '@0@-client-protocol.h'.format(output_base),
-    command: [
-      wayland_scanner,
-      'client-header',
-      '@INPUT@', '@OUTPUT@',
-    ],
-  )
-
-  gdk_wayland_sources += custom_target('@0@ source'.format(output_base),
-    input: input,
-    output: '@0@-protocol.c'.format(output_base),
-    command: [
-      wayland_scanner,
-      'private-code',
-      '@INPUT@', '@OUTPUT@',
-    ],
-  )
+  # Returns a list [.c, .h]
+  gen = wlmod.scan_xml(p)
+  assert(gen.length() == 2)
+  gdk_wayland_sources += gen[0]
+  gdk_wayland_gen_headers += gen[1]
 endforeach

 libgdk_wayland = static_library('gdk-wayland',
-  sources: [
-    gdk_wayland_sources,
-    gdk_wayland_gen_headers,
-    gdkconfig,
-    gdkenum_h,
-  ],
+  sources: [ gdk_wayland_sources, gdk_wayland_gen_headers, gdk_gen_headers ],
  include_directories: [ confinc, gdkinc, ],
  c_args: [
    '-DGTK_COMPILATION',
@@ -21,6 +21,7 @@
 #include "gdkcursor.h"
 #include "gdkwin32.h"
 #include "gdktextureprivate.h"
+#include "gdkcursorprivate.h"

 #include "gdkdisplay-win32.h"

@@ -1481,6 +1482,7 @@ gdk_win32_display_get_win32hcursor (GdkWin32Display *display,
  GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display);
  GdkWin32HCursor *win32hcursor;
  const char      *cursor_name;
+  GdkTexture      *texture;
  GdkCursor       *fallback;

  g_return_val_if_fail (cursor != NULL, NULL);
@@ -1494,14 +1496,32 @@ gdk_win32_display_get_win32hcursor (GdkWin32Display *display,
    return win32hcursor;

  cursor_name = gdk_cursor_get_name (cursor);
+  texture = gdk_cursor_get_texture (cursor);

  if (cursor_name)
    win32hcursor = gdk_win32hcursor_create_for_name (display, cursor_name);
-  else
+  else if (texture)
    win32hcursor = gdk_win32hcursor_create_for_texture (display,
-                                                        gdk_cursor_get_texture (cursor),
+                                                        texture,
                                                        gdk_cursor_get_hotspot_x (cursor),
                                                        gdk_cursor_get_hotspot_y (cursor));
+  else
+    {
+      int size = display->cursor_theme_size;
+      int width, height, hotspot_x, hotspot_y;
+
+      texture = gdk_cursor_get_texture_for_size (cursor, size, 1,
+                                                 &width, &height,
+                                                 &hotspot_x, &hotspot_y);
+      if (texture)
+        {
+          win32hcursor = gdk_win32hcursor_create_for_texture (display,
+                                                              texture,
+                                                              hotspot_x,
+                                                              hotspot_y);
+          g_object_unref (texture);
+        }
+    }

  if (win32hcursor != NULL)
    {
@@ -3071,20 +3071,6 @@ gdk_event_translate (MSG *msg,
            }
 	}

-      if ((windowpos->flags & SWP_HIDEWINDOW) &&
-	  !GDK_SURFACE_DESTROYED (window))
-	{
-	  /* Make transient parent the foreground window when window unmaps */
-	  impl = GDK_WIN32_SURFACE (window);
-
-	  if (impl->transient_owner &&
-	      GetForegroundWindow () == GDK_SURFACE_HWND (window))
-	    {
-	      SetForegroundWindow (GDK_SURFACE_HWND (impl->transient_owner));
-	      SetCapture (GDK_SURFACE_HWND (impl->transient_owner));
-	    }
-	}
-
      if (!(windowpos->flags & SWP_NOCLIENTSIZE))
 	{
 	  if (window->resize_count > 1)
@@ -4200,82 +4200,13 @@ BOOL WINAPI
 GtkShowWindow (GdkSurface *window,
               int        cmd_show)
 {
-  cairo_t *cr;
-  cairo_surface_t *surface;
-  RECT window_rect;
-  HDC hdc;
-  POINT window_position;
-  SIZE window_size;
-  POINT source_point;
-  BLENDFUNCTION blender;
-
-  HWND hwnd = GDK_SURFACE_HWND (window);
  GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);

-  switch (cmd_show)
-    {
-    case SW_FORCEMINIMIZE:
-    case SW_HIDE:
-    case SW_MINIMIZE:
-      break;
-    case SW_MAXIMIZE:
-    case SW_RESTORE:
-    case SW_SHOW:
-    case SW_SHOWDEFAULT:
-    case SW_SHOWMINIMIZED:
-    case SW_SHOWMINNOACTIVE:
-    case SW_SHOWNA:
-    case SW_SHOWNOACTIVATE:
-    case SW_SHOWNORMAL:
-      if (IsWindowVisible (hwnd))
-        break;
-
-      /* Window was hidden, will be shown. Erase it, GDK will repaint soon,
-       * but not soon enough, so it's possible to see old content before
-       * the next redraw, unless we erase the window first.
-       */
-      GetWindowRect (hwnd, &window_rect);
-      source_point.x = source_point.y = 0;
-
-      window_position.x = window_rect.left;
-      window_position.y = window_rect.top;
-      window_size.cx = window_rect.right - window_rect.left;
-      window_size.cy = window_rect.bottom - window_rect.top;
-
-      blender.BlendOp = AC_SRC_OVER;
-      blender.BlendFlags = 0;
-      blender.AlphaFormat = AC_SRC_ALPHA;
-      blender.SourceConstantAlpha = 255;
-
-      /* Create a surface of appropriate size and clear it */
-      surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
-                                                     window_size.cx,
-                                                     window_size.cy);
-      cairo_surface_set_device_scale (surface, impl->surface_scale, impl->surface_scale);
-      cr = cairo_create (surface);
-      cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-      cairo_surface_flush (surface);
-      hdc = cairo_win32_surface_get_dc (surface);
-
-      /* No API_CALL() wrapper, don't check for errors */
-      UpdateLayeredWindow (hwnd, NULL,
-                           &window_position, &window_size,
-                           hdc, &source_point,
-                           0, &blender, ULW_ALPHA);
-
-      cairo_surface_destroy (surface);
-
-      break;
-    }
-
  /* Ensure that maximized window size is corrected later on */
  if (cmd_show == SW_MAXIMIZE)
    impl->maximizing = TRUE;

-  return ShowWindow (hwnd, cmd_show);
+  return ShowWindow (GDK_SURFACE_HWND (window), cmd_show);
 }

 static void
@@ -4804,10 +4735,7 @@ gdk_win32_toplevel_set_property (GObject      *object,
      GDK_SURFACE (surface)->modal_hint = g_value_get_boolean (value);

      if (GDK_SURFACE (surface)->modal_hint)
-        {
-          SetCapture (GDK_SURFACE_HWND (surface));
-          _gdk_push_modal_window (surface);
-        }
+        _gdk_push_modal_window (surface);

      g_object_notify_by_pspec (G_OBJECT (surface), pspec);
      break;
@@ -64,7 +64,7 @@ gdk_win32_deps = [
 ]

 libgdk_win32 = static_library('gdk-win32',
-  gdk_win32_sources, gdkconfig, gdkenum_h,
+  sources: [ gdk_win32_sources, gdk_gen_headers ],
  include_directories: [ confinc, gdkinc ],
  c_args: [
    '-DGTK_COMPILATION',
@@ -274,11 +274,22 @@ gdk_x11_cursor_create_for_name (GdkDisplay  *display,
 * will have to be handled by the application (GTK applications can learn
 * about cursor theme changes by listening for change notification
 * for the corresponding `GtkSetting`).
+ *
+ * Deprecated: 4.16: Use the cursor-related properties of
+ *   [GtkSettings](../gtk4/class.Settings.html) to set the cursor theme
 */
 void
 gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
                                  const char *theme,
                                  const int    size)
+{
+  _gdk_x11_display_set_cursor_theme (display, theme, size);
+}
+
+void
+_gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
+                                   const char *theme,
+                                   const int    size)
 {
 #if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
  GdkX11Screen *x11_screen;
@@ -370,11 +381,33 @@ gdk_x11_display_get_xcursor (GdkDisplay *display,

  if (gdk_cursor_get_name (cursor))
    xcursor = gdk_x11_cursor_create_for_name (display, gdk_cursor_get_name (cursor));
-  else
+  else if (gdk_cursor_get_texture (cursor))
    xcursor = gdk_x11_cursor_create_for_texture (display,
                                                 gdk_cursor_get_texture (cursor),
                                                 gdk_cursor_get_hotspot_x (cursor),
                                                 gdk_cursor_get_hotspot_y (cursor));
+  else
+    {
+      int size;
+      GdkTexture *texture;
+      int width, height;
+      int hotspot_x, hotspot_y;
+
+      size = XcursorGetDefaultSize (GDK_DISPLAY_XDISPLAY (display));
+
+      texture = gdk_cursor_get_texture_for_size  (cursor, size, 1,
+                                                  &width, &height,
+                                                  &hotspot_x, &hotspot_y);
+
+      if (texture)
+        {
+          xcursor = gdk_x11_cursor_create_for_texture (display,
+                                                       texture,
+                                                       hotspot_x,
+                                                       hotspot_y);
+          g_object_unref (texture);
+        }
+    }

  if (xcursor != None)
    {
@@ -520,7 +520,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
  if (GDK_DISPLAY_DEBUG_CHECK (display, INPUT))
    {
      const char *type_names[] = { "logical", "physical", "floating" };
-      const char *source_names[] = { "mouse", "pen", "eraser", "cursor", "keyboard", "direct touch", "indirect touch", "trackpoint", "pad" };
+      const char *source_names[] = { "mouse", "pen", "keyboard", "direct touch", "indirect touch", "trackpoint", "pad" };
      gdk_debug_message ("input device:\n\tname: %s\n\ttype: %s\n\tsource: %s\n\thas cursor: %d\n\ttouches: %d",
                         dev->name,
                         type_names[type],
@@ -665,7 +665,6 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
      if (x11_screen->wmspec_check_window == xevent->xdestroywindow.window)
        {
          x11_screen->wmspec_check_window = None;
-          x11_screen->last_wmspec_check_time = 0;
          g_free (x11_screen->window_manager_name);
          x11_screen->window_manager_name = g_strdup ("unknown");

@@ -3079,7 +3078,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  display_class->get_monitors = gdk_x11_display_get_monitors;
  display_class->get_setting = gdk_x11_display_get_setting;
-  display_class->set_cursor_theme = gdk_x11_display_set_cursor_theme;
+  display_class->set_cursor_theme = _gdk_x11_display_set_cursor_theme;

  class->xevent = gdk_event_source_xevent;

@@ -490,7 +490,7 @@ gdk_x11_context_create_glx_context (GdkGLContext *context,
  GdkGLContext *share = gdk_display_get_gl_context (display);
  GdkX11GLContextGLX *share_glx = NULL;
  GdkSurface *surface = gdk_gl_context_get_surface (context);
-  GLXContext ctx;
+  GLXContext ctx = NULL;
  int context_attribs[N_GLX_ATTRS], i = 0, flags = 0;
  gsize major_idx, minor_idx;
  GdkGLVersion version;
@@ -206,6 +206,10 @@ GdkFilterReturn
 gdk_surface_cache_shape_filter (const XEvent *xevent,
                                gpointer      data);

+void _gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
+                                        const char *theme,
+                                        const int    size);
+
 void _gdk_x11_cursor_display_finalize (GdkDisplay *display);

 void _gdk_x11_surface_register_dnd (GdkSurface *window);
@@ -1145,7 +1145,6 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
 {
  GdkDisplay *display;
  Window window;
-  guint64 now;
  int error;

  display = x11_screen->display;
@@ -1155,11 +1154,6 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
  if (x11_screen->wmspec_check_window != None)
    return; /* already have it */

-  now = g_get_monotonic_time ();
-
-  if ((now - x11_screen->last_wmspec_check_time) / 1e6 < 15)
-    return; /* we've checked recently */
-
  window = get_net_supporting_wm_check (x11_screen, x11_screen->xroot_window);
  if (window == None)
    return;
@@ -1184,7 +1178,6 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
        return;

      x11_screen->wmspec_check_window = window;
-      x11_screen->last_wmspec_check_time = now;
      x11_screen->need_refetch_net_supported = TRUE;
      x11_screen->need_refetch_wm_name = TRUE;

@@ -48,7 +48,6 @@ struct _GdkX11Screen
  int xft_dpi;

  /* Window manager */
-  gint64 last_wmspec_check_time;
  Window wmspec_check_window;
  char *window_manager_name;

@@ -88,7 +88,7 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_program_class                   (GdkDisplay  *display,
                                                                   const char  *program_class);

-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_16
 void          gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
                                                const char *theme,
                                                const int    size);
@@ -73,12 +73,7 @@ gdk_x11_deps = [
 ]

 libgdk_x11 = static_library('gdk-x11',
-  sources: [
-    gdkmarshal_h,
-    gdkenum_h,
-    gdkconfig,
-    gdk_x11_sources,
-  ],
+  sources: [ gdk_gen_headers, gdk_x11_sources ],
  include_directories: [ confinc, gdkinc, ],
  c_args: [
    '-DGTK_COMPILATION',
@@ -4013,7 +4013,7 @@ gsk_gl_render_job_visit_subsurface_node (GskGLRenderJob      *job,
              /* Clear the area so we can see through */
              GskGLCommandBatch *batch;
              guint16 color[4];
-              rgba_to_half (&(GdkRGBA){0,0,0,0}, color);
+              rgba_to_half (&GDK_RGBA_TRANSPARENT, color);

              batch = gsk_gl_command_queue_get_batch (job->command_queue);
              batch->draw.blend = 0;
@@ -907,6 +907,7 @@ gsk_gpu_device_lookup_glyph_image (GskGpuDevice           *self,
  gsize atlas_x, atlas_y, padding;
  float subpixel_x, subpixel_y;
  PangoFont *scaled_font;
+  cairo_hint_metrics_t hint_metrics;

  cache = g_hash_table_lookup (priv->glyph_cache, &lookup);
  if (cache)
@@ -918,12 +919,15 @@ gsk_gpu_device_lookup_glyph_image (GskGpuDevice           *self,
      return cache->image;
    }

-  /* Note: we want to scale the font to the required size *and* ensure that
-   * metrics hinting is off. The latter is necessary since pango lets metrics
-   * hinting influence the rendering of hexboxes, and we get bad outcomes if
-   * that happens.
+  /* The combination of hint-style != none and hint-metrics == off
+   * leads to broken rendering with some fonts.
   */
-  scaled_font = gsk_reload_font (font, scale, CAIRO_HINT_METRICS_OFF, CAIRO_HINT_STYLE_DEFAULT, CAIRO_ANTIALIAS_DEFAULT);
+  if (gsk_font_get_hint_style (font) != CAIRO_HINT_STYLE_NONE)
+    hint_metrics = CAIRO_HINT_METRICS_ON;
+  else
+    hint_metrics = CAIRO_HINT_METRICS_DEFAULT;
+
+  scaled_font = gsk_reload_font (font, scale, hint_metrics, CAIRO_HINT_STYLE_DEFAULT, CAIRO_ANTIALIAS_DEFAULT);

  subpixel_x = (flags & 3) / 4.f;
  subpixel_y = ((flags >> 2) & 3) / 4.f;
@@ -2077,6 +2077,8 @@ gsk_gpu_node_processor_add_texture_scale_node (GskGpuNodeProcessor *self,
      /* now intersect with actual node bounds */
      if (!gsk_rect_intersection (&clip_bounds, &node->bounds, &clip_bounds))
        return;
+      clip_bounds.size.width = ceilf (clip_bounds.size.width);
+      clip_bounds.size.height = ceilf (clip_bounds.size.height);
      offscreen = gsk_gpu_node_processor_create_offscreen (self->frame,
                                                           graphene_vec2_one (),
                                                           &clip_bounds,
@@ -245,7 +245,9 @@ gsk_gpu_render_pass_end_op_vk_command (GskGpuOp              *op,

  vkCmdEndRenderPass (state->vk_command_buffer);

-  if (gsk_gpu_image_get_flags (self->target) & GSK_GPU_IMAGE_CAN_MIPMAP)
+  if ((gsk_gpu_image_get_flags (self->target) & GSK_GPU_IMAGE_CAN_MIPMAP) &&
+      (gsk_gpu_image_get_width (self->target) > 1 ||
+       gsk_gpu_image_get_height (self->target) > 1))
    {
      vkCmdPipelineBarrier (state->vk_command_buffer,
                            gsk_vulkan_image_get_vk_pipeline_stage (GSK_VULKAN_IMAGE (self->target)),
@@ -48,5 +48,5 @@ gsk_vulkan_descriptors_bind (GskVulkanDescriptors *self,
                             GskVulkanDescriptors *previous,
                             VkCommandBuffer       vk_command_buffer)
 {
-  return GSK_VULKAN_DESCRIPTORS_GET_CLASS (self)->bind (self, previous, vk_command_buffer);
+  GSK_VULKAN_DESCRIPTORS_GET_CLASS (self)->bind (self, previous, vk_command_buffer);
 }
@@ -9,6 +9,7 @@

 #include "gdk/gdkdisplayprivate.h"
 #include "gdk/gdkvulkancontextprivate.h"
+#include "gdk/gdkprofilerprivate.h"

 struct _GskVulkanDevice
 {
@@ -949,6 +950,7 @@ gsk_vulkan_device_get_vk_pipeline (GskVulkanDevice           *self,
  GdkDisplay *display;
  const char *version_string;
  char *vertex_shader_name, *fragment_shader_name;
+  G_GNUC_UNUSED gint64 begin_time = GDK_PROFILER_CURRENT_TIME;

  cache_key = (PipelineCacheKey) {
    .op_class = op_class,
@@ -1125,6 +1127,10 @@ gsk_vulkan_device_get_vk_pipeline (GskVulkanDevice           *self,
                                           NULL,
                                           &pipeline);

+  gdk_profiler_end_markf (begin_time,
+                          "Create Vulkan pipeline frag=%s vert=%s",
+                          fragment_shader_name, vertex_shader_name);
+
  g_free (fragment_shader_name);
  g_free (vertex_shader_name);

@@ -825,7 +825,7 @@ gsk_vulkan_image_new_for_dmabuf (GskVulkanDevice *device,
  self->vk_tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT;
  self->vk_format = vk_format;
  self->vk_pipeline_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
-  self->vk_image_layout = VK_IMAGE_LAYOUT_UNDEFINED;
+  self->vk_image_layout = VK_IMAGE_LAYOUT_GENERAL;
  self->vk_access = 0;

  res  = vkCreateImage (vk_device,
@@ -71,7 +71,7 @@ static inline guint
 gsk_vulkan_mipmap_levels (gsize width,
                          gsize height)
 {
-  return g_bit_nth_msf (MAX (width, height) - 1, -1) + 1;
+  return g_bit_nth_msf (MAX (MAX (width, height) - 1, 1), -1) + 1;
 }

 G_END_DECLS
@@ -556,7 +556,7 @@ gsk_standard_contour_init (GskContour             *contour,
                           gsize                   n_points,
                           const gskpathop        *ops,
                           gsize                   n_ops,
-                           ptrdiff_t               offset);
+                           gssize                  offset);

 static void
 gsk_standard_contour_copy (const GskContour *contour,
@@ -227,7 +227,7 @@ get_t_by_bisection (const GskCurve *curve,
  t1 = 0;
  t2 = 1;

-  while (t1 < t2)
+  do
    {
      t = (t1 + t2) / 2;
      if (t == t1 || t == t2)
@@ -243,6 +243,7 @@ get_t_by_bisection (const GskCurve *curve,
      else
        t2 = t;
    }
+  while (t1 < t2);

  return t;
 }
--- a/Show More
+++ b/Show More