Flip glarea back

Textures that are backed by an fbo need to be read out upside down. OpenGL, you are amazing.
2020-09-27 23:12:02 -04:00
451 changed files with 55160 additions and 24889 deletions
@@ -16,13 +16,13 @@ stages:

 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false"
+  COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dgtk:werror=true"
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v26"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v22"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v26"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"

 .only-default:
  only:
@@ -74,6 +74,7 @@ fedora-x86_64:
  script:
    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+            -Dsysprof=enabled
            _build
    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build x11
@@ -99,7 +100,6 @@ installed-tests:
  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
-    G_TEST_ACCESSIBLE: 1
  script:
    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
@@ -223,7 +223,7 @@ asan-build:
  needs: []
  variables:
  script:
-    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
+    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build wayland
  artifacts:
@@ -1,4 +1,4 @@
-FROM fedora:32
+FROM fedora:31

 RUN dnf -y install \
    adwaita-icon-theme \
@@ -44,12 +44,8 @@ RUN dnf -y install \
    lcov \
    libasan \
    libattr-devel \
-    libcloudproviders-devel \
    libepoxy-devel \
    libffi-devel \
-    libglvnd-devel \
-    libglvnd-egl \
-    libglvnd-glx \
    libmount-devel \
    librsvg2 \
    libselinux-devel \
@@ -68,6 +64,7 @@ RUN dnf -y install \
    libxslt \
    mesa-dri-drivers \
    mesa-libEGL-devel \
+    mesa-libwayland-egl-devel \
    ninja-build \
    pango-devel \
    pcre-devel \
@@ -89,5 +86,5 @@ RUN dnf -y install \
    xorg-x11-server-Xvfb \
 && dnf clean all

-RUN pip3 install meson==0.55.3
+RUN pip3 install meson==0.53.1

@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19

 RUN dnf -y install pandoc

@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v21

 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
@@ -22,7 +22,7 @@ flatpak build ${builddir} meson \
                -Dprint-backends=file \
                -Dbuild-tests=false \
                -Dbuild-examples=false \
-                -Dintrospection=disabled \
+                -Dintrospection=false \
                -Ddemos=true \
                _flatpak_build

@@ -60,12 +60,14 @@ pkg-config --modversion pango
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
+# FIXME: introspection disabled for now because of
+# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/340
 meson \
    -Dx11-backend=false \
    -Dwayland-backend=false \
    -Dwin32-backend=true \
    -Dvulkan=disabled \
-    -Dintrospection=enabled \
+    -Dintrospection=false \
    -Dgtk:werror=true \
    _build
 unset CCACHE_DISABLE
@@ -1,103 +1,19 @@
-Overview of Changes in 3.99.3
-=============================
-
-* Accessibility:
- - Add an initial AT-SPI backend
-
-* GtkEmojiChooser:
- - Allow inserting multiple Emoji by pressing Control
- - Update Emoji data to Unicode 13 / CLDR 37
- - Use translations
- - The recent-emoji setting type changed. Call
-   gsettings reset org.gtk.gtk4.Settings.EmojiChooser recent-emoji
-
-* GtkTextBuffer:
- - Add boolean returns to some get_iter functions
-
-* GtkScale:
- - Change the default value of the :draw-value property
-
-* GtkPopover:
- - Avoid losing focus when popovers are close
-
-* GtkColorChooser:
- - Add color names back for accessibility
-
-* Input methods:
- - Add a 'private' input hint
-
-* GL Renderer:
- - Fix issues with texture caching
- - Fix texture flipping problems
-
-* Build:
- - Use meson yield feature for some options
- - Require gtk-doc 1.33
- - Require sysprof 3.38
-
-* Wayland:
- - Clean up Wayland backend api, add annotations
- - Generate introspection for Wayland backend api
-
-* Windows:
- - Fix modal window handling and window stacking
-
-* MacOS:
- - Fix the build
- - Define GDK_WINDOWING_MACOS
- - Fix various event handling issues
-
-* Demos:
- - Add another column view demo
- - Add an svg paintable demo
-
-* Translation updates
- Czech
- Lithuanian
- Polish
-
-
 Overview of Changes in GTK 3.99.2
 =================================

-* GtkButton:
- - Check coordinates for button releases
-
-* GtkColorChooser:
- - Update the default palette
-
 * GtkEntry:
 - Fix issues with Emoji insertion
 - Fix issues with dnd
 - Set correct hotspot for dnd icon

-* GtkFileChooser:
- - Fix a crash
- - Fix setting unlisted filters
-
-* GtkFontChooser:
- - Determine sample text based on font coverage (requires fontconfig)
- - Allow filtering by language (requires fontconfig)
- - Don't center the list
-
-* GtkMenuButton:
- - Always use the direction property for the arrow
-
 * GtkPasswordEntry:
 - Use non-pageable memory
- - Add an ::activate signal
-
-* GtkRevealer:
- - Fix clipping issues in the swing transitions
-
-* GtkScrolledWindow:
- - Fix kinetic scrolling in X11

 * GtkSearchEntry:
 - Don't handle forwarded events twice

-* GtkStack:
- - Add gtk_stack_add_child
+* GtkPasswordEntry:
+ - Add an ::activate signal

 * GtkTextView:
 - Fix dnd
@@ -106,9 +22,30 @@ Overview of Changes in GTK 3.99.2
 - Make clickable links work again
 - Fix handling of anchored children

+* GtkRevealer:
+ - Fix clipping issues in the swing transitions
+
+* GtkColorChooser:
+ - Update the default palette
+
+* GtkFileChooser:
+ - Fix a crash
+ - Fix setting unlisted filters
+
+* GtkFontChooser:
+ - Determine sample text based on font coverage
+ - Allow filtering by language
+ - Don't center the list
+
+* GtkStack:
+ - Add gtk_stack_add_child
+
 * GtkVideo:
 - Make autoplay work

+* GtkButton:
+ - Check coordinates for button releases
+
 * CSS:
 - Allow more than 64 selectors per rule
 - Avoid some allocation overhead
@@ -125,15 +62,12 @@ Overview of Changes in GTK 3.99.2

 * GSK:
 - Add radial gradient nodes
- - Add GskGLShader and shader nodes

 * GL renderer:
 - Fix clipping with projective transforms
 - Use linear interpolation for offscreen rendering
   with non-axis-aligned transforms
 - Fix texture caching to avoid size mismatches
- - Avoid downloading GL textures when possible,
-   improving GtkGLArea performance

 * Vulkan renderer:
 - Fix swapchain creation
@@ -143,7 +77,6 @@ Overview of Changes in GTK 3.99.2

 * Wayland
 - Always ack configure to avoid jumping windows
- - Use the primary-selection-unstable-v1 protocol

 * API cleanups:
 - Make filter and sorter constructors return exact types
@@ -162,7 +95,6 @@ Overview of Changes in GTK 3.99.2
 - Cosmetic improvements for several demos
 - Improve search in the sidebar
 - Add a Shadertoy demo
- - Add a OpenGL transitions demo
 - Add an Emblem demo
 - Add a demo for input validation and error states
 - Add a demo for context menus
@@ -182,7 +114,6 @@ Overview of Changes in GTK 3.99.2
 French
 Galician
 German
- Hebrew
 Hungarian
 Indonesian
 Italian
@@ -1,26 +0,0 @@
-uniform float u_time;
-
-void
-mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  vec2 pos = (fragCoord.xy * 2.0 - resolution.xy)/ min (resolution.x, resolution.y) ;
-
-  float t0 = sin ((u_time + 0.00)*1.0);
-  float t1 = sin ((u_time + 0.30)*0.4);
-  float t2 = cos ((u_time + 0.23)*0.9);
-  float t3 = cos ((u_time + 0.41)*0.6);
-  float t4 = cos ((u_time + 0.11)*0.3);
-
-  vec2 p0 = vec2 (t1, t0) ;
-  vec2 p1 = vec2 (t2, t3) ;
-  vec2 p2 = vec2 (t4, t3) ;
-
-  float r = 1.0/distance (pos, p0);
-  float g = 1.0/distance (pos, p1);
-  float b = 1.0/distance (pos, p2);
-  float sum = r + g + b;
-
-  float alpha = 1.0 - pow (1.0/(sum), 40)*pow (10.0, 40*0.7);
-
-  fragColor = vec4 (r*0.5, g*0.5, b*0.5, 1.0) * alpha;
-}
@@ -158,6 +158,7 @@ do_builder (GtkWidget *do_widget)
      about = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
      gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window));
      gtk_window_set_hide_on_close (GTK_WINDOW (about), TRUE);
+      g_signal_connect (about, "response", G_CALLBACK (gtk_widget_hide), NULL);
      g_object_set_data_full (G_OBJECT (window), "about",
                              about, (GDestroyNotify)gtk_window_destroy);

@@ -1,226 +0,0 @@
-uniform float iTime;
-
-// Originally from: https://www.shadertoy.com/view/3ljyDD
-// License CC0: Hexagonal tiling + cog wheels
-//  Nothing fancy, just hexagonal tiling + cog wheels
-
-#define PI      3.141592654
-#define TAU     (2.0*PI)
-#define MROT(a) mat2(cos(a), sin(a), -sin(a), cos(a))
-
-float hash(in vec2 co) {
-  return fract(sin(dot(co.xy ,vec2(12.9898,58.233))) * 13758.5453);
-}
-
-float pcos(float a) {
-  return 0.5 + 0.5*cos(a);
-}
-
-void rot(inout vec2 p, float a) {
-  float c = cos(a);
-  float s = sin(a);
-  p = vec2(c*p.x + s*p.y, -s*p.x + c*p.y);
-}
-
-float modPolar(inout vec2 p, float repetitions) {
-  float angle = 2.0*PI/repetitions;
-  float a = atan(p.y, p.x) + angle/2.;
-  float r = length(p);
-  float c = floor(a/angle);
-  a = mod(a,angle) - angle/2.;
-  p = vec2(cos(a), sin(a))*r;
-  // For an odd number of repetitions, fix cell index of the cell in -x direction
-  // (cell index would be e.g. -5 and 5 in the two halves of the cell):
-  if (abs(c) >= (repetitions/2.0)) c = abs(c);
-  return c;
-}
-
-float pmin(float a, float b, float k) {
-  float h = clamp( 0.5+0.5*(b-a)/k, 0.0, 1.0 );
-  return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-const vec2 sz       = vec2(1.0, sqrt(3.0));
-const vec2 hsz      = 0.5*sz;
-const float smallCount = 16.0;
-
-vec2 hextile(inout vec2 p) {
-  // See Art of Code: Hexagonal Tiling Explained!
-  // https://www.youtube.com/watch?v=VmrIDyYiJBA
-
-  vec2 p1 = mod(p, sz)-hsz;
-  vec2 p2 = mod(p - hsz*1.0, sz)-hsz;
-  vec2 p3 = mix(p2, p1, vec2(length(p1) < length(p2)));
-  vec2 n = p3 - p;
-  p = p3;
-
-  return n;
-}
-
-float circle(vec2 p, float r) {
-  return length(p) - r;
-}
-
-float box(vec2 p, vec2 b) {
-  vec2 d = abs(p)-b;
-  return length(max(d,0.0)) + min(max(d.x,d.y),0.0);
-}
-
-float unevenCapsule(vec2 p, float r1, float r2, float h) {
-  p.x = abs(p.x);
-  float b = (r1-r2)/h;
-  float a = sqrt(1.0-b*b);
-  float k = dot(p,vec2(-b,a));
-  if( k < 0.0 ) return length(p) - r1;
-  if( k > a*h ) return length(p-vec2(0.0,h)) - r2;
-  return dot(p, vec2(a,b) ) - r1;
-}
-
-float cogwheel(vec2 p, float innerRadius, float outerRadius, float cogs, float holes) {
-  float cogWidth  = 0.25*innerRadius*TAU/cogs;
-
-  float d0 = circle(p, innerRadius);
-
-  vec2 icp = p;
-  modPolar(icp, holes);
-  icp -= vec2(innerRadius*0.55, 0.0);
-  float d1 = circle(icp, innerRadius*0.25);
-
-  vec2 cp = p;
-  modPolar(cp, cogs);
-  cp -= vec2(innerRadius, 0.0);
-  float d2 = unevenCapsule(cp.yx, cogWidth, cogWidth*0.75, (outerRadius-innerRadius));
-
-  float d3 = circle(p, innerRadius*0.20);
-
-  float d = 1E6;
-  d = min(d, d0);
-  d = pmin(d, d2, 0.5*cogWidth);
-  d = min(d, d2);
-  d = max(d, -d1);
-  d = max(d, -d3);
-
-  return d;
-}
-
-float ccell1(vec2 p, float r) {
-  float d = 1E6;
-  const float bigCount = 60.0;
-
-  vec2 cp0 = p;
-  rot(cp0, -iTime*TAU/bigCount);
-  float d0 = cogwheel(cp0, 0.36, 0.38, bigCount, 5.0);
-
-  vec2 cp1 = p;
-  float nm = modPolar(cp1, 6.0);
-
-  cp1 -= vec2(0.5, 0.0);
-  rot(cp1, 0.2+TAU*nm/2.0 + iTime*TAU/smallCount);
-  float d1 = cogwheel(cp1, 0.11, 0.125, smallCount, 5.0);
-
-  d = min(d, d0);
-  d = min(d, d1);
-  return d;
-}
-
-float ccell2(vec2 p, float r) {
-  float d = 1E6;
-  vec2 cp0 = p;
-  float nm = modPolar(cp0, 6.0);
-  vec2 cp1 = cp0;
-  const float off = 0.275;
-  const float count = smallCount + 2.0;
-  cp0 -= vec2(off, 0.0);
-  rot(cp0, 0.+TAU*nm/2.0 - iTime*TAU/count);
-  float d0 = cogwheel(cp0, 0.09, 0.105, count, 5.0);
-
-
-  cp1 -= vec2(0.5, 0.0);
-  rot(cp1, 0.2+TAU*nm/2.0 + iTime*TAU/smallCount);
-  float d1 = cogwheel(cp1, 0.11, 0.125, smallCount, 5.0);
-
-  float l = length(p);
-  float d2 = l - (off+0.055);
-  float d3 = d2 + 0.020;;
-
-  vec2 tp0 = p;
-  modPolar(tp0, 60.0);
-  tp0.x -= off;
-  float d4 = box(tp0, vec2(0.0125, 0.005));
-
-  float ctime = -(iTime*0.05 + r)*TAU;
-
-  vec2 tp1 = p;
-  rot(tp1, ctime*12.0);
-  tp1.x -= 0.13;
-  float d5 = box(tp1, vec2(0.125, 0.005));
-
-  vec2 tp2 = p;
-  rot(tp2, ctime);
-  tp2.x -= 0.13*0.5;
-  float d6 = box(tp2, vec2(0.125*0.5, 0.0075));
-
-  float d7 = l - 0.025;
-  float d8 = l - 0.0125;
-
-  d = min(d, d0);
-  d = min(d, d1);
-  d = min(d, d2);
-  d = max(d, -d3);
-  d = min(d, d4);
-  d = min(d, d5);
-  d = min(d, d6);
-  d = min(d, d7);
-  d = max(d, -d8);
-
-  return d;
-}
-
-float df(vec2 p, float scale, inout vec2 nn) {
-  p /= scale;
-  nn = hextile(p);
-  nn = round(nn);
-  float r = hash(nn);
-
-  float d;;
-
-  if (r < 0.5) {
-    d = ccell1(p, r);
-  } else {
-    d = ccell2(p, r);
-  }
-
-  return d*scale;
-}
-
-vec3 postProcess(vec3 col, vec2 q)  {
-  //col = saturate(col);
-  col=pow(clamp(col,0.0,1.0),vec3(0.75));
-  col=col*0.6+0.4*col*col*(3.0-2.0*col);  // contrast
-  col=mix(col, vec3(dot(col, vec3(0.33))), -0.4);  // satuation
-  col*=0.5+0.5*pow(19.0*q.x*q.y*(1.0-q.x)*(1.0-q.y),0.7);  // vigneting
-  return col;
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv) {
-  vec2 q = fragCoord/resolution.xy;
-  vec2 p = -1.0 + 2.0*q;
-  p.x *= resolution.x/resolution.y;
-  float tm = iTime*0.1;
-  p += vec2(cos(tm), sin(tm*sqrt(0.5)));
-  float z = mix(0.5, 1.0, pcos(tm*sqrt(0.3)));
-  float aa = 4.0 / resolution.y;
-
-  vec2 nn = vec2(0.0);
-  float d = df(p, z, nn);
-
-  vec3 col = vec3(160.0)/vec3(255.0);
-  vec3 baseCol = vec3(0.3);
-  vec4 logoCol = vec4(baseCol, 1.0)*smoothstep(-aa, 0.0, -d);
-  col = mix(col, logoCol.xyz, pow(logoCol.w, 8.0));
-  col += 0.4*pow(abs(sin(20.0*d)), 0.6);
-
-  col = postProcess(col, q);
-
-  fragColor = vec4(col, 1.0);
-}
@@ -1,27 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/crosswarp
-// Author: Eke Péter <peterekepeter@gmail.com>
-// License: MIT
-
-vec4 transition(vec2 p) {
-  float x = progress;
-  x=smoothstep(.0,1.0,(x*2.0+p.x-1.0));
-  return mix(getFromColor((p-.5)*(1.-x)+.5), getToColor((p-.5)*x+.5), x);
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -133,21 +133,6 @@
    <file>cogs.glsl</file>
    <file>glowingstars.glsl</file>
  </gresource>
-  <gresource prefix="/gltransition">
-    <file>gtkshaderstack.c</file>
-    <file>gtkshaderstack.h</file>
-    <file>gtkshaderbin.h</file>
-    <file>gtkshaderbin.c</file>
-    <file>gskshaderpaintable.h</file>
-    <file>gskshaderpaintable.c</file>
-    <file>wind.glsl</file>
-    <file>radial.glsl</file>
-    <file>crosswarp.glsl</file>
-    <file>kaleidoscope.glsl</file>
-    <file>cogs2.glsl</file>
-    <file>ripple.glsl</file>
-    <file>background.glsl</file>
-  </gresource>
  <gresource prefix="/iconscroll">
    <file>iconscroll.ui</file>
  </gresource>
@@ -184,9 +169,6 @@
  <gresource prefix="/listview_settings">
    <file>listview_settings.ui</file>
  </gresource>
-  <gresource prefix="/listview_ucd_data/">
-    <file>ucdnames.data</file>
-  </gresource>
  <gresource prefix="/listview_weather">
    <file compressed="true">listview_weather.txt</file>
  </gresource>
@@ -204,9 +186,6 @@
    <file>demo3widget.h</file>
    <file>demo3widget.ui</file>
  </gresource>
-  <gresource prefix="/paintable_svg">
-    <file>org.gtk.gtk4.NodeEditor.Devel.svg</file>
-  </gresource>
  <gresource prefix="/shortcuts">
    <file>shortcuts.ui</file>
    <file>shortcuts-builder.ui</file>
@@ -268,7 +247,6 @@
    <file>gears.c</file>
    <file>gestures.c</file>
    <file>glarea.c</file>
-    <file>gltransition.c</file>
    <file>headerbar.c</file>
    <file>hypertext.c</file>
    <file>iconscroll.c</file>
@@ -287,7 +265,6 @@
    <file>listview_filebrowser.c</file>
    <file>listview_minesweeper.c</file>
    <file>listview_settings.c</file>
-    <file>listview_ucd.c</file>
    <file>listview_weather.c</file>
    <file>listview_words.c</file>
    <file>list_store.c</file>
@@ -302,7 +279,6 @@
    <file>paintable_animated.c</file>
    <file>paintable_emblem.c</file>
    <file>paintable_mediastream.c</file>
-    <file>paintable_svg.c</file>
    <file>panes.c</file>
    <file>password_entry.c</file>
    <file>peg_solitaire.c</file>
@@ -47,38 +47,6 @@ get_image_paintable (GtkImage *image)
    }
 }

-static void
-update_drag_icon (DemoImage   *demo,
-                  GtkDragIcon *icon)
-{
-  const char *icon_name;
-  GdkPaintable *paintable;
-  GtkWidget *image;
-
-  switch (gtk_image_get_storage_type (GTK_IMAGE (demo->image)))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      paintable = gtk_image_get_paintable (GTK_IMAGE (demo->image));
-      image = gtk_image_new_from_paintable (paintable);
-      break;
-    case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (GTK_IMAGE (demo->image));
-      image = gtk_image_new_from_icon_name (icon_name);
-      break;
-    case GTK_IMAGE_EMPTY:
-    case GTK_IMAGE_GICON:
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (GTK_IMAGE (demo->image)));
-      return;
-    }
-
-  gtk_image_set_pixel_size (GTK_IMAGE (image),
-                            gtk_image_get_pixel_size (GTK_IMAGE (demo->image)));
-
-  gtk_drag_icon_set_child (icon, image);
-}
-
 static void
 drag_begin (GtkDragSource *source,
            GdkDrag       *drag,
@@ -86,8 +54,14 @@ drag_begin (GtkDragSource *source,
 {
  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkPaintable *paintable;

-  update_drag_icon (demo, GTK_DRAG_ICON (gtk_drag_icon_get_for_drag (drag)));
+  paintable = get_image_paintable (GTK_IMAGE (demo->image));
+  if (paintable)
+    {
+      gtk_drag_icon_set_from_paintable (drag, paintable, -2, -2);
+      g_object_unref (paintable);
+    }
 }

 static GdkContentProvider *
@@ -9,7 +9,6 @@

 #include "gtkfishbowl.h"
 #include "gtkgears.h"
-#include "gskshaderpaintable.h"

 const char *const css =
 ".blurred-button {"
@@ -150,38 +149,6 @@ create_switch (void)
  return w;
 }

-static gboolean
-update_paintable (GtkWidget     *widget,
-                  GdkFrameClock *frame_clock,
-                  gpointer       user_data)
-{
-  GskShaderPaintable *paintable;
-  gint64 frame_time;
-
-  paintable = GSK_SHADER_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget)));
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-  gsk_shader_paintable_update_time (paintable, 0, frame_time);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static GtkWidget *
-create_cogs (void)
-{
-  GtkWidget *picture;
-  static GskGLShader *cog_shader = NULL;
-  GdkPaintable *paintable;
-
- if (cog_shader == NULL)
-    cog_shader = gsk_gl_shader_new_from_resource ("/gltransition/cogs2.glsl");
-  paintable = gsk_shader_paintable_new (g_object_ref (cog_shader), NULL);
-  picture = gtk_picture_new_for_paintable (paintable);
-  gtk_widget_set_size_request (picture, 150, 75);
-  gtk_widget_add_tick_callback (picture, update_paintable, NULL, NULL);
-
-  return picture;
-}
-
 static void
 mapped (GtkWidget *w)
 {
@@ -218,7 +185,6 @@ static const struct {
  { "Gears",      create_gears          },
  { "Switch",     create_switch         },
  { "Menubutton", create_menu_button    },
-  { "Shader",     create_cogs           },
 };

 static int selected_widget_type = -1;
@@ -406,7 +406,6 @@ create_glarea_window (GtkWidget *do_widget)
  gl_area = gtk_gl_area_new ();
  gtk_widget_set_hexpand (gl_area, TRUE);
  gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_widget_set_size_request (gl_area, 100, 200);
  gtk_box_append (GTK_BOX (box), gl_area);

  /* We need to initialize and free GL resources, so we use
@@ -1,350 +0,0 @@
-/* OpenGL/Transitions
- * #Keywords: OpenGL, shader, effect
- *
- * Create transitions between pages using a custom fragment shader.
- *
- * The example transitions here are taken from gl-transitions.com, and you
- * can edit the shader code itself on the last page of the stack.
- *
- * The transitions work with arbitrary content. We use images, shaders
- * GL areas and plain old widgets to demonstrate this.
- *
- * The demo also shows some over-the-top effects like wobbly widgets,
- * and animated backgrounds.
- */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include "gtkshaderstack.h"
-#include "gtkshaderbin.h"
-#include "gtkshadertoy.h"
-#include "gskshaderpaintable.h"
-
-static GtkWidget *demo_window = NULL;
-
-static void
-close_window (GtkWidget *widget)
-{
-  /* Reset the state */
-  demo_window = NULL;
-}
-
-static void
-text_changed (GtkTextBuffer *buffer,
-              GtkWidget     *button)
-{
-  gtk_widget_show (button);
-}
-
-static void
-apply_text (GtkWidget     *button,
-            GtkTextBuffer *buffer)
-{
-  GtkWidget *stack;
-  GskGLShader *shader;
-  GtkTextIter start, end;
-  char *text;
-
-  stack = g_object_get_data (G_OBJECT (button), "the-stack");
-
-  gtk_text_buffer_get_bounds (buffer, &start, &end);
-  text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-
-  GBytes *bytes = g_bytes_new_take (text, strlen (text));
-  shader = gsk_gl_shader_new_from_bytes (bytes);
-
-  gtk_shader_stack_set_shader (GTK_SHADER_STACK (stack), shader);
-
-  g_object_unref (shader);
-  g_bytes_unref (bytes);
-
-  gtk_widget_hide (button);
-}
-
-static void
-go_back (GtkWidget     *button,
-         GtkWidget     *stack)
-{
-  gtk_shader_stack_transition (GTK_SHADER_STACK (stack), FALSE);
-}
-
-static void
-go_forward (GtkWidget     *button,
-            GtkWidget     *stack)
-{
-  gtk_shader_stack_transition (GTK_SHADER_STACK (stack), TRUE);
-}
-
-static void
-clicked_cb (GtkGestureClick *gesture,
-            guint            n_pressed,
-            double           x,
-            double           y,
-            gpointer         data)
-{
-  gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
-}
-
-static GtkWidget *
-ripple_bin_new (void)
-{
-  GtkWidget *bin = gtk_shader_bin_new ();
-  static GskGLShader *shader = NULL;
-
-  if (shader == NULL)
-    shader = gsk_gl_shader_new_from_resource ("/gltransition/ripple.glsl");
-
-  gtk_shader_bin_add_shader (GTK_SHADER_BIN (bin), shader, GTK_STATE_FLAG_PRELIGHT, GTK_STATE_FLAG_PRELIGHT, 20);
-
-  return bin;
-}
-
-static GtkWidget *
-new_shadertoy (const char *path)
-{
-  GBytes *shader;
-  GtkWidget *toy;
-
-  toy = gtk_shadertoy_new ();
-  shader = g_resources_lookup_data (path, 0, NULL);
-  gtk_shadertoy_set_image_shader (GTK_SHADERTOY (toy),
-                                  g_bytes_get_data (shader, NULL));
-  g_bytes_unref (shader);
-
-  return toy;
-}
-
-static gboolean
-update_paintable (GtkWidget     *widget,
-                  GdkFrameClock *frame_clock,
-                  gpointer       user_data)
-{
-  GskShaderPaintable *paintable;
-  gint64 frame_time;
-
-  paintable = GSK_SHADER_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget)));
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-  gsk_shader_paintable_update_time (paintable, 0, frame_time);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static GtkWidget *
-make_shader_stack (const char *name,
-                   const char *resource_path,
-                   int active_child,
-                   GtkWidget  *scale)
-{
-  GtkWidget *stack, *child, *widget, *vbox, *hbox, *bin;
-  GtkWidget *label, *button, *tv;
-  GskGLShader *shader;
-  GObjectClass *class;
-  GParamSpecFloat *pspec;
-  GtkAdjustment *adjustment;
-  GtkTextBuffer *buffer;
-  GBytes *bytes;
-  GtkEventController *controller;
-  GtkCssProvider *provider;
-  GdkPaintable *paintable;
-
-  stack = gtk_shader_stack_new ();
-  shader = gsk_gl_shader_new_from_resource (resource_path);
-  gtk_shader_stack_set_shader (GTK_SHADER_STACK (stack), shader);
-  g_object_unref (shader);
-
-  child = gtk_picture_new_for_resource ("/css_blendmodes/ducky.png");
-  gtk_picture_set_can_shrink (GTK_PICTURE (child), TRUE);
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  shader = gsk_gl_shader_new_from_resource ("/gltransition/cogs2.glsl");
-  paintable = gsk_shader_paintable_new (shader, NULL);
-
-  child = gtk_picture_new_for_paintable (paintable);
-  gtk_widget_add_tick_callback (child, update_paintable, NULL, NULL);
-  gtk_picture_set_can_shrink (GTK_PICTURE (child), TRUE);
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  child = gtk_picture_new_for_resource ("/transparent/portland-rose.jpg");
-  gtk_picture_set_can_shrink (GTK_PICTURE (child), TRUE);
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  child = new_shadertoy ("/shadertoy/neon.glsl");
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-
-  class = g_type_class_ref (GTK_TYPE_SHADER_STACK);
-  pspec = G_PARAM_SPEC_FLOAT (g_object_class_find_property (class, "duration"));
-
-  adjustment = gtk_range_get_adjustment (GTK_RANGE (scale));
-  if (gtk_adjustment_get_lower (adjustment) == 0.0 &&
-      gtk_adjustment_get_upper (adjustment) == 0.0)
-    {
-      gtk_adjustment_configure (adjustment,
-                                pspec->default_value,
-                                pspec->minimum,
-                                pspec->maximum,
-                                0.1, 0.5, 0);
-    }
-
-  g_type_class_unref (class);
-
-  g_object_bind_property (adjustment, "value",
-                          stack, "duration",
-                          G_BINDING_DEFAULT);
-
-  widget = gtk_scrolled_window_new ();
-  gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (widget), TRUE);
-  gtk_widget_set_hexpand (widget, TRUE);
-  gtk_widget_set_vexpand (widget, TRUE);
-
-  controller = GTK_EVENT_CONTROLLER (gtk_gesture_click_new ());
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (controller), 0);
-  g_signal_connect (controller, "released", G_CALLBACK (clicked_cb), NULL);
-  gtk_event_controller_set_propagation_phase (controller, GTK_PHASE_BUBBLE);
-  gtk_widget_add_controller (GTK_WIDGET (widget), controller);
-
-  tv = gtk_text_view_new ();
-  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (tv), 4);
-  gtk_text_view_set_right_margin (GTK_TEXT_VIEW (tv), 4);
-  gtk_text_view_set_top_margin (GTK_TEXT_VIEW (tv), 4);
-  gtk_text_view_set_bottom_margin (GTK_TEXT_VIEW (tv), 4);
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
-  bytes = g_resources_lookup_data (resource_path, 0, NULL);
-  gtk_text_buffer_set_text (buffer,
-                            (const char *)g_bytes_get_data (bytes, NULL),
-                            g_bytes_get_size (bytes));
-  g_bytes_unref (bytes);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (widget), tv);
-
-  gtk_box_append (GTK_BOX (child), widget);
-
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  gtk_shader_stack_set_active (GTK_SHADER_STACK (stack), active_child);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-
-  widget = gtk_center_box_new ();
-  label = gtk_label_new (name);
-  gtk_widget_add_css_class (label, "title-4");
-  gtk_widget_set_size_request (label, -1, 26);
-  gtk_center_box_set_center_widget (GTK_CENTER_BOX (widget), label);
-
-  button = gtk_button_new_from_icon_name ("view-refresh-symbolic");
-  g_signal_connect (buffer, "changed", G_CALLBACK (text_changed), button);
-  g_object_set_data (G_OBJECT (button), "the-stack", stack);
-  g_signal_connect (button, "clicked", G_CALLBACK (apply_text), buffer);
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, "button.small { padding: 0; }", -1);
-  gtk_style_context_add_provider (gtk_widget_get_style_context (button),
-                                  GTK_STYLE_PROVIDER (provider),
-                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-  g_object_unref (provider);
-  gtk_widget_set_halign (button, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-  gtk_widget_add_css_class (button, "small");
-  gtk_widget_hide (button);
-  gtk_center_box_set_end_widget (GTK_CENTER_BOX (widget), button);
-
-  gtk_box_append (GTK_BOX (vbox), widget);
-
-  GtkWidget *bin2 = ripple_bin_new ();
-  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin2), stack);
-
-  gtk_box_append (GTK_BOX (vbox), bin2);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
-
-  gtk_box_append (GTK_BOX (vbox), hbox);
-
-  button = gtk_button_new_from_icon_name ("go-previous-symbolic");
-  g_signal_connect (button, "clicked", G_CALLBACK (go_back), stack);
-  bin = ripple_bin_new ();
-  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button);
-  gtk_box_append (GTK_BOX (hbox), bin);
-
-  button = gtk_button_new_from_icon_name ("go-next-symbolic");
-  g_signal_connect (button, "clicked", G_CALLBACK (go_forward), stack);
-  bin = ripple_bin_new ();
-  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button);
-  gtk_box_append (GTK_BOX (hbox), bin);
-
-  return vbox;
-}
-
-static GtkWidget *
-create_gltransition_window (GtkWidget *do_widget)
-{
-  GtkWidget *window, *headerbar, *scale, *outer_grid, *grid, *background;
-  GdkPaintable *paintable;
-
-  window = gtk_window_new ();
-  gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Transitions");
-  headerbar = gtk_header_bar_new ();
-  scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
-  gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
-  gtk_widget_set_size_request (scale, 100, -1);
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), scale);
-  gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
-
-  outer_grid = gtk_grid_new ();
-  gtk_window_set_child (GTK_WINDOW (window), outer_grid);
-
-  paintable = gsk_shader_paintable_new (gsk_gl_shader_new_from_resource ("/gltransition/background.glsl"), NULL);
-  background = gtk_picture_new_for_paintable (paintable);
-  gtk_widget_add_tick_callback (background, update_paintable, NULL, NULL);
-
-  gtk_grid_attach (GTK_GRID (outer_grid),
-                   background,
-                   0, 0, 1, 1);
-
-  grid = gtk_grid_new ();
-  gtk_grid_attach (GTK_GRID (outer_grid),
-                   grid,
-                   0, 0, 1, 1);
-
-  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (grid, GTK_ALIGN_CENTER);
-  gtk_widget_set_margin_start (grid, 12);
-  gtk_widget_set_margin_end (grid, 12);
-  gtk_widget_set_margin_top (grid, 12);
-  gtk_widget_set_margin_bottom (grid, 12);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-  gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
-  gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
-
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Wind", "/gltransition/wind.glsl", 0, scale),
-                   0, 0, 1, 1);
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Radial", "/gltransition/radial.glsl", 1, scale),
-                   1, 0, 1, 1);
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Crosswarp", "/gltransition/crosswarp.glsl", 2, scale),
-                   0, 1, 1, 1);
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Kaleidoscope", "/gltransition/kaleidoscope.glsl", 3, scale),
-                   1, 1, 1, 1);
-
-  return window;
-}
-
-GtkWidget *
-do_gltransition (GtkWidget *do_widget)
-{
-  if (!demo_window)
-    demo_window = create_gltransition_window (do_widget);
-
-  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_show (demo_window);
-  else
-    gtk_window_destroy (GTK_WINDOW (demo_window));
-
-  return demo_window;
-}
@@ -1,337 +0,0 @@
-/*
- * Copyright © 2020 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen <mclasen@redhat.com>
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-#include "gskshaderpaintable.h"
-
-/**
- * SECTION:gskshaderpaintable
- * @Short_description: Drawing with shaders
- * @Title: GskShaderPaintable
- * @see_also: #GdkPaintable
- *
- * GskShaderPaintable is an implementation of the #GdkPaintable interface
- * that uses a #GskGLShader to create pixels.
- *
- * You can set the uniform data that the shader needs for rendering
- * using gsk_shader_paintable_set_args(). This function can
- * be called repeatedly to change the uniform data for the next
- * snapshot.
- *
- * Commonly, time is passed to shaders as a float uniform containing
- * the elapsed time in seconds. The convenience API
- * gsk_shader_paintable_update_time() can be called from a #GtkTickCallback
- * to update the time based on the frame time of the frame clock.
- */
-
-
-struct _GskShaderPaintable
-{
-  GObject parent_instance;
-
-  GskGLShader *shader;
-  GBytes *args;
-
-  gint64 start_time;
-};
-
-struct _GskShaderPaintableClass
-{
-  GObjectClass parent_class;
-};
-
-enum {
-  PROP_0,
-  PROP_SHADER,
-  PROP_ARGS,
-
-  N_PROPS,
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gsk_shader_paintable_paintable_snapshot (GdkPaintable *paintable,
-                                         GdkSnapshot  *snapshot,
-                                         double        width,
-                                         double        height)
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (paintable);
-
-  gtk_snapshot_push_gl_shader (snapshot, self->shader, &GRAPHENE_RECT_INIT(0, 0, width, height), g_bytes_ref (self->args));
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-gsk_shader_paintable_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gsk_shader_paintable_paintable_snapshot;
-}
-
-G_DEFINE_TYPE_EXTENDED (GskShaderPaintable, gsk_shader_paintable, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                               gsk_shader_paintable_paintable_init))
-
-static void
-gsk_shader_paintable_set_property (GObject      *object,
-                                   guint         prop_id,
-                                   const GValue *value,
-                                   GParamSpec   *pspec)
-
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_SHADER:
-      gsk_shader_paintable_set_shader (self, g_value_get_object (value));
-      break;
-
-    case PROP_ARGS:
-      gsk_shader_paintable_set_args (self, g_value_get_boxed (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gsk_shader_paintable_get_property (GObject    *object,
-                                   guint       prop_id,
-                                   GValue     *value,
-                                   GParamSpec *pspec)
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_SHADER:
-      g_value_set_object (value, self->shader);
-      break;
-
-    case PROP_ARGS:
-      g_value_set_boxed (value, self->args);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gsk_shader_paintable_finalize (GObject *object)
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (object);
-
-  g_clear_pointer (&self->args, g_bytes_unref);
-  g_clear_object (&self->shader);
-
-  G_OBJECT_CLASS (gsk_shader_paintable_parent_class)->finalize (object);
-}
-
-static void
-gsk_shader_paintable_class_init (GskShaderPaintableClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gsk_shader_paintable_get_property;
-  gobject_class->set_property = gsk_shader_paintable_set_property;
-  gobject_class->finalize = gsk_shader_paintable_finalize;
-
-  properties[PROP_SHADER] =
-    g_param_spec_object ("shader", "Shader", "The shader",
-                         GSK_TYPE_GL_SHADER,
-                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_ARGS] =
-    g_param_spec_boxed ("args", "Arguments", "The uniform arguments",
-                        G_TYPE_BYTES,
-                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gsk_shader_paintable_init (GskShaderPaintable *self)
-{
-}
-
-/**
- * gsk_shader_paintable_new:
- * @shader: (transfer full) (nullable): the shader to use
- * @data: (transfer full) (nullable): uniform data
- *
- * Creates a paintable that uses the @shader to create
- * pixels. The shader must not require input textures.
- * If @data is %NULL, all uniform values are set to zero.
- *
- * Returns: (transfer full): a new #GskShaderPaintable
- */
-GdkPaintable *
-gsk_shader_paintable_new (GskGLShader *shader,
-                          GBytes      *data)
-{
-  GdkPaintable *ret;
-
-  g_return_val_if_fail (shader == NULL || GSK_IS_GL_SHADER (shader), NULL);
-
-  if (shader && !data)
-    {
-      int size = gsk_gl_shader_get_args_size (shader);
-      data = g_bytes_new_take (g_new0 (guchar, size), size);
-    }
-
-  ret = g_object_new (GSK_TYPE_SHADER_PAINTABLE,
-                      "shader", shader,
-                      "args", data,
-                      NULL);
-
-  g_clear_object (&shader);
-  g_clear_pointer (&data, g_bytes_unref);
-
-  return ret;
-}
-
-/**
- * gsk_shader_paintable_set_shader:
- * @self: a #GskShaderPaintable
- * @shader: the #GskGLShader to use
- *
- * Sets the shader that the paintable will use
- * to create pixels. The shader must not require
- * input textures.
- */
-void
-gsk_shader_paintable_set_shader (GskShaderPaintable *self,
-                                 GskGLShader        *shader)
-{
-  g_return_if_fail (GSK_IS_SHADER_PAINTABLE (self));
-  g_return_if_fail (shader == NULL || GSK_IS_GL_SHADER (shader));
-  g_return_if_fail (shader == NULL || gsk_gl_shader_get_n_textures (shader) == 0);
-
-  if (!g_set_object (&self->shader, shader))
-    return;
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SHADER]);
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-
-  g_clear_pointer (&self->args, g_bytes_unref);
-}
-
-/**
- * gsk_shader_paintable_get_shader:
- * @self: a #GskShaderPaintable
- *
- * Returns the shader that the paintable is using.
- *
- * Returns: (transfer none): the #GskGLShader that is used
- */
-GskGLShader *
-gsk_shader_paintable_get_shader (GskShaderPaintable *self)
-{
-  g_return_val_if_fail (GSK_IS_SHADER_PAINTABLE (self), NULL);
-
-  return self->shader;
-}
-
-/**
- * gsk_shader_paintable_set_args:
- * @self: a #GskShaderPaintable
- * @data: Data block with uniform data for the shader
- *
- * Sets the uniform data that will be passed to the
- * shader when rendering. The @data will typically
- * be produced by a #GskUniformDataBuilder.
- *
- * Note that the @data should be considered immutable
- * after it has been passed to this function.
- */
-void
-gsk_shader_paintable_set_args (GskShaderPaintable *self,
-                                       GBytes             *data)
-{
-  g_return_if_fail (GSK_IS_SHADER_PAINTABLE (self));
-  g_return_if_fail (data == NULL || g_bytes_get_size (data) == gsk_gl_shader_get_args_size (self->shader));
-
-  g_clear_pointer (&self->args, g_bytes_unref);
-  if (data)
-    self->args = g_bytes_ref (data);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ARGS]);
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-}
-
-/**
- * gsk_shader_paintable_get_args:
- * @self: a #GskShaderPaintable
- *
- * Returns the uniform data set with
- * gsk_shader_paintable_get_args().
- *
- * Returns: (transfer none): the uniform data
- */
-GBytes *
-gsk_shader_paintable_get_args (GskShaderPaintable *self)
-{
-  g_return_val_if_fail (GSK_IS_SHADER_PAINTABLE (self), NULL);
-
-  return self->args;
-}
-
-/**
- * gsk_shader_paintable_update_time:
- * @self: a #GskShaderPaintable
- * @time_idx: the index of the uniform for time in seconds as float
- * @frame_time: the current frame time, as returned by #GdkFrameClock
- *
- * This function is a convenience wrapper for
- * gsk_shader_paintable_set_args() that leaves all
- * uniform values unchanged, except for the uniform with
- * index @time_idx, which will be set to the elapsed time
- * in seconds, since the first call to this function.
- *
- * This function is usually called from a #GtkTickCallback.
- */
-void
-gsk_shader_paintable_update_time (GskShaderPaintable *self,
-                                  int                 time_idx,
-                                  gint64              frame_time)
-{
-  GskShaderArgsBuilder *builder;
-  GBytes *args;
-  float time;
-
-  if (self->start_time == 0)
-    self->start_time = frame_time;
-
-  time = (frame_time - self->start_time) / (float)G_TIME_SPAN_SECOND;
-
-  builder = gsk_shader_args_builder_new (self->shader, self->args);
-  gsk_shader_args_builder_set_float (builder, time_idx, time);
-  args = gsk_shader_args_builder_free_to_args (builder);
-
-  gsk_shader_paintable_set_args (self, args);
-
-  g_bytes_unref (args);
-}
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2020 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen <mclasen@redhat.com>
- */
-
-#ifndef __GSK_SHADER_PAINTABLE_H__
-#define __GSK_SHADER_PAINTABLE_H__
-
-#include <gdk/gdk.h>
-#include <gsk/gsk.h>
-
-G_BEGIN_DECLS
-
-#define GSK_TYPE_SHADER_PAINTABLE (gsk_shader_paintable_get_type ())
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (GskShaderPaintable, gsk_shader_paintable, GSK, SHADER_PAINTABLE, GObject)
-
-GDK_AVAILABLE_IN_ALL
-GdkPaintable *   gsk_shader_paintable_new              (GskGLShader        *shader,
-                                                        GBytes             *data);
-
-GDK_AVAILABLE_IN_ALL
-GskGLShader *    gsk_shader_paintable_get_shader       (GskShaderPaintable *self);
-GDK_AVAILABLE_IN_ALL
-void             gsk_shader_paintable_set_shader       (GskShaderPaintable *self,
-                                                        GskGLShader        *shader);
-GDK_AVAILABLE_IN_ALL
-GBytes *         gsk_shader_paintable_get_args         (GskShaderPaintable *self);
-GDK_AVAILABLE_IN_ALL
-void             gsk_shader_paintable_set_args         (GskShaderPaintable *self,
-                                                        GBytes             *data);
-GDK_AVAILABLE_IN_ALL
-void             gsk_shader_paintable_update_time      (GskShaderPaintable *self,
-                                                        int                 time_idx,
-                                                        gint64              frame_time);
-G_END_DECLS
-
-#endif /* __GSK_SHADER_PAINTABLE_H__ */
@@ -764,7 +764,7 @@ gtk_gears_realize (GtkWidget *widget)
  glShaderSource(v, 1, &p, NULL);
  glCompileShader(v);
  glGetShaderInfoLog(v, sizeof msg, NULL, msg);
-  g_debug ("vertex shader info: %s\n", msg);
+  g_print ("vertex shader info: %s\n", msg);

  /* Compile the fragment shader */
  if (gdk_gl_context_get_use_es (context))
@@ -775,7 +775,7 @@ gtk_gears_realize (GtkWidget *widget)
  glShaderSource(f, 1, &p, NULL);
  glCompileShader(f);
  glGetShaderInfoLog(f, sizeof msg, NULL, msg);
-  g_debug ("fragment shader info: %s\n", msg);
+  g_print ("fragment shader info: %s\n", msg);

  /* Create and link the shader program */
  program = glCreateProgram();
@@ -786,7 +786,7 @@ gtk_gears_realize (GtkWidget *widget)

  glLinkProgram(program);
  glGetProgramInfoLog(program, sizeof msg, NULL, msg);
-  g_debug ("program info: %s\n", msg);
+  g_print ("program info: %s\n", msg);
  glDeleteShader (v);
  glDeleteShader (f);

@@ -1,264 +0,0 @@
-#include "gtkshaderbin.h"
-
-typedef struct {
-  GskGLShader *shader;
-  GtkStateFlags state;
-  GtkStateFlags state_mask;
-  float extra_border;
-  gboolean compiled;
-  gboolean compiled_ok;
-} ShaderInfo;
-
-struct _GtkShaderBin
-{
-  GtkWidget parent_instance;
-  GtkWidget *child;
-  ShaderInfo *active_shader;
-  GPtrArray *shaders;
-  guint tick_id;
-  float time;
-  float mouse_x, mouse_y;
-  gint64 first_frame_time;
-};
-
-struct _GtkShaderBinClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GtkShaderBin, gtk_shader_bin, GTK_TYPE_WIDGET)
-
-static void
-shader_info_free (ShaderInfo *info)
-{
-  g_object_unref (info->shader);
-  g_free (info);
-}
-
-static void
-gtk_shader_bin_finalize (GObject *object)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (object);
-
-  g_ptr_array_free (self->shaders, TRUE);
-
-  G_OBJECT_CLASS (gtk_shader_bin_parent_class)->finalize (object);
-}
-
-static void
-gtk_shader_bin_dispose (GObject *object)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (object);
-
-  g_clear_pointer (&self->child, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (gtk_shader_bin_parent_class)->dispose (object);
-}
-
-static gboolean
-gtk_shader_bin_tick (GtkWidget     *widget,
-                     GdkFrameClock *frame_clock,
-                     gpointer       unused)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (widget);
-  gint64 frame_time;
-
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-  if (self->first_frame_time == 0)
-    self->first_frame_time = frame_time;
-  self->time = (frame_time - self->first_frame_time) / (float)G_USEC_PER_SEC;
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-motion_cb (GtkEventControllerMotion *controller,
-           double                    x,
-           double                    y,
-           GtkShaderBin             *self)
-{
-  self->mouse_x = x;
-  self->mouse_y = y;
-}
-
-static void
-gtk_shader_bin_init (GtkShaderBin *self)
-{
-  GtkEventController *controller;
-  self->shaders = g_ptr_array_new_with_free_func ((GDestroyNotify)shader_info_free);
-
-  controller = gtk_event_controller_motion_new ();
-  g_signal_connect (controller, "motion", G_CALLBACK (motion_cb), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-}
-
-void
-gtk_shader_bin_update_active_shader (GtkShaderBin *self)
-{
-  GtkStateFlags new_state = gtk_widget_get_state_flags (GTK_WIDGET (self));
-  ShaderInfo *new_shader = NULL;
-
-  for (int i = 0; i < self->shaders->len; i++)
-    {
-      ShaderInfo *info = g_ptr_array_index (self->shaders, i);
-
-      if ((info->state_mask & new_state) == info->state)
-        {
-          new_shader = info;
-          break;
-        }
-    }
-
-  if (self->active_shader == new_shader)
-    return;
-
-  self->active_shader = new_shader;
-  self->first_frame_time = 0;
-
-  if (self->active_shader)
-    {
-      if (self->tick_id == 0)
-        self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self),
-                                                      gtk_shader_bin_tick,
-                                                      NULL, NULL);
-    }
-  else
-    {
-      if (self->tick_id != 0)
-        {
-          gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick_id);
-          self->tick_id = 0;
-        }
-    }
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-gtk_shader_bin_state_flags_changed (GtkWidget        *widget,
-                                    GtkStateFlags     previous_state_flags)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (widget);
-
-  gtk_shader_bin_update_active_shader (self);
-}
-
-void
-gtk_shader_bin_add_shader (GtkShaderBin *self,
-                           GskGLShader  *shader,
-                           GtkStateFlags state,
-                           GtkStateFlags state_mask,
-                           float         extra_border)
-{
-  ShaderInfo *info = g_new0 (ShaderInfo, 1);
-  info->shader = g_object_ref (shader);
-  info->state = state;
-  info->state_mask = state_mask;
-  info->extra_border = extra_border;
-
-  g_ptr_array_add (self->shaders, info);
-
-  gtk_shader_bin_update_active_shader (self);
-}
-
-void
-gtk_shader_bin_set_child (GtkShaderBin *self,
-                          GtkWidget    *child)
-{
-
-  if (self->child == child)
-    return;
-
-  g_clear_pointer (&self->child, gtk_widget_unparent);
-
-  if (child)
-    {
-      self->child = child;
-      gtk_widget_set_parent (child, GTK_WIDGET (self));
-    }
-}
-
-GtkWidget *
-gtk_shader_bin_get_child   (GtkShaderBin *self)
-{
-  return self->child;
-}
-
-static void
-gtk_shader_bin_snapshot (GtkWidget   *widget,
-                         GtkSnapshot *snapshot)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  if (self->active_shader)
-    {
-      if (!self->active_shader->compiled)
-        {
-          GtkNative *native = gtk_widget_get_native (widget);
-          GskRenderer *renderer = gtk_native_get_renderer (native);
-          GError *error = NULL;
-
-          self->active_shader->compiled = TRUE;
-          self->active_shader->compiled_ok =
-            gsk_gl_shader_compile (self->active_shader->shader,
-                                   renderer, &error);
-          if (!self->active_shader->compiled_ok)
-            {
-              g_warning ("GtkShaderBin failed to compile shader: %s", error->message);
-              g_error_free (error);
-            }
-        }
-
-      if (self->active_shader->compiled_ok)
-        {
-          float border = self->active_shader->extra_border;
-          graphene_vec2_t mouse;
-          graphene_vec2_init (&mouse, self->mouse_x + border, self->mouse_y + border);
-          gtk_snapshot_push_gl_shader (snapshot, self->active_shader->shader,
-                                       &GRAPHENE_RECT_INIT(-border, -border, width+2*border, height+2*border),
-                                       gsk_gl_shader_format_args (self->active_shader->shader,
-                                                                  "u_time", self->time,
-                                                                  "u_mouse", &mouse,
-                                                                  NULL));
-          gtk_widget_snapshot_child (widget, self->child, snapshot);
-          gtk_snapshot_gl_shader_pop_texture (snapshot);
-          gtk_snapshot_pop (snapshot);
-
-          return;
-        }
-    }
-
-  /* Non-shader fallback */
-  gtk_widget_snapshot_child (widget, self->child, snapshot);
-}
-
-static void
-gtk_shader_bin_class_init (GtkShaderBinClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = gtk_shader_bin_finalize;
-  object_class->dispose = gtk_shader_bin_dispose;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-
-  widget_class->snapshot = gtk_shader_bin_snapshot;
-  widget_class->state_flags_changed = gtk_shader_bin_state_flags_changed;
-}
-
-GtkWidget *
-gtk_shader_bin_new (void)
-{
-  GtkShaderBin *self;
-
-  self = g_object_new (GTK_TYPE_SHADER_BIN, NULL);
-
-  return GTK_WIDGET (self);
-}
@@ -1,23 +0,0 @@
-#ifndef __GTK_SHADER_BIN_H__
-#define __GTK_SHADER_BIN_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SHADER_BIN      (gtk_shader_bin_get_type ())
-G_DECLARE_FINAL_TYPE (GtkShaderBin, gtk_shader_bin, GTK, SHADER_BIN, GtkWidget)
-
-GtkWidget  *gtk_shader_bin_new        (void);
-void        gtk_shader_bin_add_shader (GtkShaderBin *self,
-                                       GskGLShader  *shader,
-                                       GtkStateFlags state,
-                                       GtkStateFlags state_mask,
-                                       float         extra_border);
-void       gtk_shader_bin_set_child   (GtkShaderBin *self,
-                                       GtkWidget    *child);
-GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
-
-G_END_DECLS
-
-#endif /* __GTK_SHADER_BIN_H__ */
@@ -1,361 +0,0 @@
-#include "gtkshaderstack.h"
-
-struct _GtkShaderStack
-{
-  GtkWidget parent_instance;
-
-  GskGLShader *shader;
-  GPtrArray *children;
-  int current;
-  int next;
-  gboolean backwards;
-
-  guint tick_id;
-  float time;
-  float duration;
-  gint64 start_time;
-};
-
-struct _GtkShaderStackClass
-{
-  GtkWidgetClass parent_class;
-};
-
-
-enum {
-  PROP_DURATION = 1,
-  NUM_PROPERTIES
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL };
-
-G_DEFINE_TYPE (GtkShaderStack, gtk_shader_stack, GTK_TYPE_WIDGET)
-
-static void
-gtk_shader_stack_finalize (GObject *object)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  g_object_unref (self->shader);
-
-  G_OBJECT_CLASS (gtk_shader_stack_parent_class)->finalize (object);
-}
-
-static void
-update_child_visible (GtkShaderStack *self)
-{
-  int i;
-
-  for (i = 0; i < self->children->len; i++)
-    {
-      GtkWidget *child = g_ptr_array_index (self->children, i);
-
-      gtk_widget_set_child_visible (child,
-                                    i == self->current || i == self->next);
-    }
-}
-
-static gboolean
-transition_cb (GtkWidget     *widget,
-               GdkFrameClock *clock,
-               gpointer       unused)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  gint64 frame_time;
-
-  frame_time = gdk_frame_clock_get_frame_time (clock);
-
-  if (self->start_time == 0)
-    self->start_time = frame_time;
-
-  self->time = (frame_time - self->start_time) / (float)G_USEC_PER_SEC;
-
-  gtk_widget_queue_draw (widget);
-
-  if (self->time >= self->duration)
-    {
-      self->current = self->next;
-      self->next = -1;
-
-      update_child_visible (self);
-
-      return G_SOURCE_REMOVE;
-    }
-  else
-    return G_SOURCE_CONTINUE;
-}
-
-static void
-start_transition (GtkShaderStack *self)
-{
-  self->start_time = 0;
-  self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self),
-                                                transition_cb,
-                                                NULL, NULL);
-}
-
-static void
-stop_transition (GtkShaderStack *self)
-{
-  if (self->tick_id != 0)
-    {
-      gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick_id);
-      self->tick_id = 0;
-    }
-
-  if (self->next != -1)
-    self->current = self->next;
-  self->next = -1;
-
-  update_child_visible (self);
-}
-
-static void
-gtk_shader_stack_dispose (GObject *object)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  stop_transition (self);
-
-  g_clear_pointer (&self->children, g_ptr_array_unref);
-
-  G_OBJECT_CLASS (gtk_shader_stack_parent_class)->dispose (object);
-}
-
-void
-gtk_shader_stack_transition (GtkShaderStack *self,
-                             gboolean forward)
-{
-  stop_transition (self);
-
-  self->backwards = !forward;
-  if (self->backwards)
-    self->next = (self->current + self->children->len - 1) % self->children->len;
-  else
-    self->next = (self->current + 1) % self->children->len;
-
-  update_child_visible (self);
-
-  start_transition (self);
-}
-
-static void
-gtk_shader_stack_init (GtkShaderStack *self)
-{
-  self->children = g_ptr_array_new_with_free_func ((GDestroyNotify)gtk_widget_unparent);
-  self->current = -1;
-  self->next = -1;
-  self->backwards = FALSE;
-  self->duration = 1.0;
-}
-
-static void
-gtk_shader_stack_measure (GtkWidget      *widget,
-                          GtkOrientation  orientation,
-                          int             for_size,
-                          int            *minimum,
-                          int            *natural,
-                          int            *minimum_baseline,
-                          int            *natural_baseline)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  int i;
-
-  *minimum = 0;
-  *natural = 0;
-
-  for (i = 0; i < self->children->len; i++)
-    {
-      GtkWidget *child = g_ptr_array_index (self->children, i);
-      int child_min, child_nat;
-
-      if (gtk_widget_get_visible (child))
-        {
-          gtk_widget_measure (child, orientation, for_size, &child_min, &child_nat, NULL, NULL);
-
-          *minimum = MAX (*minimum, child_min);
-          *natural = MAX (*natural, child_nat);
-        }
-    }
-}
-
-static void
-gtk_shader_stack_size_allocate (GtkWidget *widget,
-                                int        width,
-                                int        height,
-                                int        baseline)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  GtkAllocation child_allocation;
-  GtkWidget *child;
-  int i;
-
-  child_allocation.x = 0;
-  child_allocation.y = 0;
-  child_allocation.width = width;
-  child_allocation.height = height;
-
-  for (i = 0; i < self->children->len; i++)
-    {
-      child = g_ptr_array_index (self->children, i);
-      if (gtk_widget_get_visible (child))
-        gtk_widget_size_allocate (child, &child_allocation, -1);
-    }
-}
-
-static void
-gtk_shader_stack_snapshot (GtkWidget   *widget,
-                           GtkSnapshot *snapshot)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  int width, height;
-  GtkWidget *current, *next;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  current = g_ptr_array_index (self->children, self->current);
-
-  if (self->next == -1)
-    {
-      gtk_widget_snapshot_child (widget, current, snapshot);
-    }
-  else
-    {
-      GtkNative *native = gtk_widget_get_native (widget);
-      GskRenderer *renderer = gtk_native_get_renderer (native);
-      float progress;
-
-      next = g_ptr_array_index (self->children, self->next);
-
-      progress = self->time / self->duration;
-
-      if (self->backwards)
-        {
-          GtkWidget *tmp = next;
-          next = current;
-          current = tmp;
-          progress = 1. - progress;
-        }
-
-      if (gsk_gl_shader_compile (self->shader, renderer, NULL))
-        {
-          gtk_snapshot_push_gl_shader (snapshot,
-                                       self->shader,
-                                       &GRAPHENE_RECT_INIT(0, 0, width, height),
-                                       gsk_gl_shader_format_args (self->shader,
-                                                                  "progress", progress,
-                                                                  NULL));
-
-          gtk_widget_snapshot_child (widget, current, snapshot);
-          gtk_snapshot_gl_shader_pop_texture (snapshot); /* current child */
-          gtk_widget_snapshot_child (widget, next, snapshot);
-          gtk_snapshot_gl_shader_pop_texture (snapshot); /* next child */
-          gtk_snapshot_pop (snapshot);
-        }
-      else
-        {
-          /* Non-shader fallback */
-          gtk_widget_snapshot_child (widget, current, snapshot);
-        }
-    }
-}
-
-static void
-gtk_shader_stack_get_property (GObject      *object,
-                               guint         prop_id,
-                               GValue       *value,
-                               GParamSpec   *pspec)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  switch (prop_id)
-    {
-    case PROP_DURATION:
-      g_value_set_float (value, self->duration);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_shader_stack_set_property (GObject      *object,
-                               guint         prop_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  switch (prop_id)
-    {
-    case PROP_DURATION:
-      self->duration = g_value_get_float (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_shader_stack_class_init (GtkShaderStackClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = gtk_shader_stack_finalize;
-  object_class->dispose = gtk_shader_stack_dispose;
-  object_class->get_property = gtk_shader_stack_get_property;
-  object_class->set_property = gtk_shader_stack_set_property;
-
-  widget_class->snapshot = gtk_shader_stack_snapshot;
-  widget_class->measure = gtk_shader_stack_measure;
-  widget_class->size_allocate = gtk_shader_stack_size_allocate;
-
-  properties[PROP_DURATION] =
-      g_param_spec_float ("duration", "Duration", "Duration",
-                          0.1, 3.0, 1.0,
-                          G_PARAM_READWRITE);
-
-  g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
-}
-
-GtkWidget *
-gtk_shader_stack_new (void)
-{
-  return g_object_new (GTK_TYPE_SHADER_STACK, NULL);
-}
-
-void
-gtk_shader_stack_set_shader (GtkShaderStack *self,
-                             GskGLShader    *shader)
-{
-  g_set_object (&self->shader, shader);
-}
-
-void
-gtk_shader_stack_add_child (GtkShaderStack *self,
-                            GtkWidget      *child)
-{
-  g_ptr_array_add (self->children, child);
-  gtk_widget_set_parent (child, GTK_WIDGET (self));
-  gtk_widget_queue_resize (GTK_WIDGET (self));
-
-  if (self->current == -1)
-    self->current = 0;
-  else
-    gtk_widget_set_child_visible (child, FALSE);
-}
-
-void
-gtk_shader_stack_set_active (GtkShaderStack *self,
-                             int             index)
-{
-  stop_transition (self);
-  self->current = MIN (index, self->children->len);
-  update_child_visible (self);
-}
@@ -1,23 +0,0 @@
-#ifndef __GTK_SHADER_STACK_H__
-#define __GTK_SHADER_STACK_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SHADER_STACK     (gtk_shader_stack_get_type ())
-G_DECLARE_FINAL_TYPE (GtkShaderStack, gtk_shader_stack, GTK, SHADER_STACK, GtkWidget)
-
-GtkWidget * gtk_shader_stack_new          (void);
-void        gtk_shader_stack_set_shader   (GtkShaderStack *self,
-                                           GskGLShader    *shader);
-void        gtk_shader_stack_add_child    (GtkShaderStack *self,
-                                           GtkWidget      *child);
-void        gtk_shader_stack_transition   (GtkShaderStack *self,
-                                           gboolean        forward);
-void        gtk_shader_stack_set_active   (GtkShaderStack *self,
-                                           int             index);
-
-G_END_DECLS
-
-#endif /* __GTK_SHADER_STACK_H__ */
@@ -56,15 +56,13 @@ const char *fragment_prefix =
  "uniform float     iSampleRate;           // sound sample rate (i.e., 44100)\n"
  "\n"
  "in vec2 fragCoord;\n"
-  "out vec4 vFragColor;\n";
+  "out vec4 fragColor;\n";


 // Fragment shader suffix
 const char *fragment_suffix =
  "    void main() {\n"
-  "        vec4 c;\n"
-  "        mainImage(c, fragCoord);\n"
-  "         vFragColor = c;\n"
+  "        mainImage(fragColor, fragCoord);\n"
  "    }\n";

 typedef struct {
@@ -1,41 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/kaleidoscope
-// Author: nwoeanhinnogaehr
-// License: MIT
-
-const float speed = 1.0;
-const float angle = 1.0;
-const float power = 1.5;
-
-vec4 transition(vec2 uv) {
-  vec2 p = uv.xy / vec2(1.0).xy;
-  vec2 q = p;
-  float t = pow(progress, power)*speed;
-  p = p -0.5;
-  for (int i = 0; i < 7; i++) {
-    p = vec2(sin(t)*p.x + cos(t)*p.y, sin(t)*p.y - cos(t)*p.x);
-    t += angle;
-    p = abs(mod(p, 2.0) - 1.0);
-  }
-  abs(mod(p, 1.0));
-  return mix(
-    mix(getFromColor(q), getToColor(q), progress),
-    mix(getFromColor(p), getToColor(p), progress), 1.0 - 2.0*abs(progress - 0.5));
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -1,374 +0,0 @@
-/* Lists/Characters
- *
- * This demo shows a multi-column representation of some parts
- * of the Unicode Character Database, or UCD.
- *
- * The dataset used here has 33 796 items.
- */
-
-#include <gtk/gtk.h>
-#include "script-names.h"
-#include "unicode-names.h"
-
-
-#define UCD_TYPE_ITEM (ucd_item_get_type ())
-G_DECLARE_FINAL_TYPE (UcdItem, ucd_item, UCD, ITEM, GObject)
-
-struct _UcdItem
-{
-  GObject parent_instance;
-  gunichar codepoint;
-  const char *name;
-};
-
-struct _UcdItemClass
-{
-  GObjectClass parent_class;
-};
-
-G_DEFINE_TYPE (UcdItem, ucd_item, G_TYPE_OBJECT)
-
-static void
-ucd_item_init (UcdItem *item)
-{
-}
-
-static void
-ucd_item_class_init (UcdItemClass *class)
-{
-}
-
-static UcdItem *
-ucd_item_new (gunichar    codepoint,
-              const char *name)
-{
-  UcdItem *item;
-
-  item = g_object_new (UCD_TYPE_ITEM, NULL);
-
-  item->codepoint = codepoint;
-  item->name = name;
-
-  return item;
-}
-
-static gunichar
-ucd_item_get_codepoint (UcdItem *item)
-{
-  return item->codepoint;
-}
-
-static const char *
-ucd_item_get_name (UcdItem *item)
-{
-  return item->name;
-}
-
-static GListModel *
-ucd_model_new (void)
-{
-  GBytes *bytes;
-  GVariant *v;
-  GVariantIter *iter;
-  GListStore *store;
-  guint u;
-  char *name;
-
-  bytes = g_resources_lookup_data ("/listview_ucd_data/ucdnames.data", 0, NULL);
-  v = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(us)"), bytes, TRUE));
-
-  iter = g_variant_iter_new (v);
-
-  store = g_list_store_new (G_TYPE_OBJECT);
-  while (g_variant_iter_next (iter, "(us)", &u, &name))
-    {
-      if (u == 0)
-        continue;
-
-      UcdItem *item = ucd_item_new (u, name);
-      g_list_store_append (store, item);
-      g_object_unref (item);
-    }
-
-  g_variant_iter_free (iter);
-  g_variant_unref (v);
-  g_bytes_unref (bytes);
-
-  return G_LIST_MODEL (store);
-}
-
-static void
-setup_centered_label (GtkSignalListItemFactory *factory,
-                      GObject                  *listitem)
-{
-  GtkWidget *label;
-  label = gtk_label_new ("");
-  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
-}
-
-static void
-setup_label (GtkSignalListItemFactory *factory,
-             GObject                  *listitem)
-{
-  GtkWidget *label;
-  label = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
-}
-
-static void
-setup_ellipsizing_label (GtkSignalListItemFactory *factory,
-                         GObject                  *listitem)
-{
-  GtkWidget *label;
-  label = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
-  gtk_label_set_width_chars (GTK_LABEL (label), 20);
-  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
-}
-
-static void
-bind_codepoint (GtkSignalListItemFactory *factory,
-                GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-  char buffer[16] = { 0, };
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  g_snprintf (buffer, 10, "%#06x", codepoint);
-  gtk_label_set_label (GTK_LABEL (label), buffer);
-}
-
-static void
-bind_char (GtkSignalListItemFactory *factory,
-           GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-  char buffer[16] = { 0, };
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  if (g_unichar_isprint (codepoint))
-    g_unichar_to_utf8 (codepoint, buffer);
-
-  gtk_label_set_label (GTK_LABEL (label), buffer);
-}
-
-static void
-bind_name (GtkSignalListItemFactory *factory,
-           GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  const char *name;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  name = ucd_item_get_name (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), name);
-}
-
-static void
-bind_type (GtkSignalListItemFactory *factory,
-           GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), get_unicode_type_name (g_unichar_type (codepoint)));
-}
-
-static void
-bind_break_type (GtkSignalListItemFactory *factory,
-                 GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), get_break_type_name (g_unichar_break_type (codepoint)));
-}
-
-static void
-bind_combining_class (GtkSignalListItemFactory *factory,
-                      GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), get_combining_class_name (g_unichar_combining_class (codepoint)));
-}
-
-static void
-bind_script (GtkSignalListItemFactory *factory,
-             GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-  GUnicodeScript script;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-  script = g_unichar_get_script (codepoint);
-
-  gtk_label_set_label (GTK_LABEL (label), get_script_name (script));
-}
-
-static void
-selection_changed (GObject    *object,
-                   GParamSpec *pspec,
-                   GtkWidget  *label)
-{
-  UcdItem *item;
-  guint codepoint;
-  char buffer[16] = { 0, };
-
-  item = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (object));
-  codepoint = ucd_item_get_codepoint (item);
-
-  if (g_unichar_isprint (codepoint))
-    g_unichar_to_utf8 (codepoint, buffer);
-
-  gtk_label_set_label (GTK_LABEL (label), buffer);
-}
-
-static GtkWidget *
-create_ucd_view (GtkWidget *label)
-{
-  GtkWidget *cv;
-  GListModel *ucd_model;
-  GtkSingleSelection *selection;
-  GtkListItemFactory *factory;
-  GtkColumnViewColumn *column;
-
-  ucd_model = ucd_model_new ();
-
-  selection = gtk_single_selection_new (ucd_model);
-  gtk_single_selection_set_autoselect (selection, TRUE);
-  gtk_single_selection_set_can_unselect (selection, FALSE);
-  g_signal_connect (selection, "notify::selected", G_CALLBACK (selection_changed), label);
-
-  cv = gtk_column_view_new (GTK_SELECTION_MODEL (selection));
-  gtk_column_view_set_show_column_separators (GTK_COLUMN_VIEW (cv), TRUE);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_centered_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_codepoint), NULL);
-  column = gtk_column_view_column_new ("Codepoint", factory);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_centered_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_char), NULL);
-  column = gtk_column_view_column_new ("Char", factory);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_ellipsizing_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_name), NULL);
-  column = gtk_column_view_column_new ("Name", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_ellipsizing_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_type), NULL);
-  column = gtk_column_view_column_new ("Type", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_ellipsizing_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_break_type), NULL);
-  column = gtk_column_view_column_new ("Break Type", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_combining_class), NULL);
-  column = gtk_column_view_column_new ("Combining Class", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_script), NULL);
-  column = gtk_column_view_column_new ("Script", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-
-  return cv;
-}
-
-static GtkWidget *window;
-
-GtkWidget *
-do_listview_ucd (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *listview, *sw;
-      GtkWidget *box, *label;
-      GtkCssProvider *provider;
-
-      window = gtk_window_new ();
-      gtk_window_set_default_size (GTK_WINDOW (window), 800, 400);
-      gtk_window_set_title (GTK_WINDOW (window), "Characters");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      label = gtk_label_new ("");
-      gtk_label_set_width_chars (GTK_LABEL (label), 2);
-      gtk_widget_add_css_class (label, "enormous");
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, "label.enormous { font-size: 80px; }", -1);
-      gtk_style_context_add_provider (gtk_widget_get_style_context (label), GTK_STYLE_PROVIDER (provider), 800);
-      gtk_widget_set_hexpand (label, TRUE);
-      gtk_box_append (GTK_BOX (box), label);
-
-      sw = gtk_scrolled_window_new ();
-      gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (sw), TRUE);
-      listview = create_ucd_view (label);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-      gtk_box_prepend (GTK_BOX (box), sw);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
-
@@ -391,7 +391,7 @@ display_nothing (const char *resource)
  GtkWidget *widget;
  char *str;

-  str = g_strdup_printf ("The contents of the resource at '%s' cannot be displayed", resource);
+  str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource);
  widget = gtk_label_new (str);
  gtk_label_set_wrap (GTK_LABEL (widget), TRUE);

@@ -410,7 +410,6 @@ static struct {
  { ".gif", NULL, display_image },
  { ".jpg", NULL, display_image },
  { ".png", NULL, display_image },
-  { ".svg", NULL, display_image },
  { ".c", "c", display_text },
  { ".css", "css", display_text },
  { ".glsl", NULL, display_text },
@@ -32,7 +32,6 @@ demos = files([
  'gears.c',
  'gestures.c',
  'glarea.c',
-  'gltransition.c',
  'headerbar.c',
  'hypertext.c',
  'iconscroll.c',
@@ -103,10 +102,7 @@ extra_demo_sources = files(['main.c',
                            'gtkfishbowl.c',
                            'fontplane.c',
                            'gtkgears.c',
-                            'gtkshaderbin.c',
                            'gtkshadertoy.c',
-                            'gtkshaderstack.c',
-                            'gskshaderpaintable.c',
                            'puzzlepiece.c',
                            'bluroverlay.c',
                            'demoimage.c',
@@ -121,8 +117,8 @@ extra_demo_sources = files(['main.c',
                            'demo3widget.c'])

 if harfbuzz_dep.found() and pangoft_dep.found()
-  demos += files(['font_features.c', 'listview_ucd.c'])
-  extra_demo_sources += files(['script-names.c', 'language-names.c', 'unicode-names.c'])
+  demos += files('font_features.c')
+  extra_demo_sources += files(['script-names.c', 'language-names.c'])
  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
 endif

@@ -130,13 +126,6 @@ if os_unix
  demos += files('pagesetup.c')
 endif

-librsvg_dep = dependency('librsvg-2.0', version: '>= 2.46.0', required: false)
-
-if librsvg_dep.found()
-  demos += files('paintable_svg.c')
-  gtkdemo_deps += [ librsvg_dep ]
-endif
-
 gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]

 demos_h = custom_target('gtk4 demo header',
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="43.000351" x2="85.000351" y1="39.000164" y2="39.000164">
-        <stop offset="0" stop-color="#26a269"/>
-        <stop offset="0.0934161" stop-color="#84e3b7"/>
-        <stop offset="0.330831" stop-color="#26a269"/>
-        <stop offset="0.686952" stop-color="#26a269"/>
-        <stop offset="0.89736" stop-color="#175e3c"/>
-        <stop offset="1" stop-color="#26a269"/>
-    </linearGradient>
-    <linearGradient id="b" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.154754" stop-color="#ffffff"/>
-        <stop offset="0.433722" stop-color="#bdbbb5"/>
-        <stop offset="0.650505" stop-color="#c1c0ba"/>
-        <stop offset="0.825253" stop-color="#ffffff"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="c" gradientTransform="matrix(0.0811899 -0.046875 0.069079 0.119648 307.03142 127.069456)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="d" gradientTransform="matrix(-0.0811899 -0.046875 -0.069079 0.119648 -177.242852 127.069447)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14" x2="56" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#813d9c"/>
-        <stop offset="0.109119" stop-color="#b378ca"/>
-        <stop offset="0.241583" stop-color="#813d9c"/>
-        <stop offset="0.731841" stop-color="#813d9c"/>
-        <stop offset="0.872163" stop-color="#4d255d"/>
-        <stop offset="1" stop-color="#813d9c"/>
-    </linearGradient>
-    <linearGradient id="f" gradientUnits="userSpaceOnUse" x1="72" x2="114" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#e66100"/>
-        <stop offset="0.0678478" stop-color="#ff903e"/>
-        <stop offset="0.168852" stop-color="#e66100"/>
-        <stop offset="0.886626" stop-color="#e66100"/>
-        <stop offset="1" stop-color="#9d4200"/>
-    </linearGradient>
-    <clipPath id="g">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="h">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <filter id="i" height="100%" width="100%" x="0%" y="0%">
-        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-    </filter>
-    <mask id="j">
-        <g clip-path="url(#h)" filter="url(#i)">
-            <g clip-path="url(#g)">
-                <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
-                <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
-                <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
-                <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
-                <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
-                <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
-                <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
-                <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
-            </g>
-        </g>
-    </mask>
-    <mask id="k">
-        <g filter="url(#i)">
-            <rect fill-opacity="0.8" height="128" width="128"/>
-        </g>
-    </mask>
-    <linearGradient id="l" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
-        <stop offset="0" stop-color="#f9f06b"/>
-        <stop offset="1" stop-color="#f5c211"/>
-    </linearGradient>
-    <clipPath id="m">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="n">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
-    <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
-    <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
-    <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
-    <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
-    <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
-    <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
-    <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
-    <g clip-path="url(#n)" mask="url(#j)">
-        <g clip-path="url(#m)" mask="url(#k)">
-            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#l)"/>
-            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
-        </g>
-    </g>
-</svg>
@@ -1,241 +0,0 @@
-/* Paintable/SVG
- *
- * This demo shows wrapping a librsvg RsvgHandle in a GdkPaintable
- * to display an SVG image that can be scaled by resizing the window.
- *
- * This demo relies on librsvg, which GTK itself does not link against.
- */
-
-#include <gtk/gtk.h>
-#include <librsvg/rsvg.h>
-
-#define SVG_TYPE_PAINTABLE (svg_paintable_get_type ())
-
-G_DECLARE_FINAL_TYPE (SvgPaintable, svg_paintable, SVG, PAINTABLE, GObject)
-
-struct _SvgPaintable
-{
-  GObject parent_instance;
-  GFile *file;
-  RsvgHandle *handle;
-};
-
-struct _SvgPaintableClass
-{
-  GObjectClass parent_class;
-};
-
-enum {
-  PROP_FILE = 1,
-  NUM_PROPERTIES
-};
-
-static void
-svg_paintable_snapshot (GdkPaintable *paintable,
-                        GdkSnapshot  *snapshot,
-                        double        width,
-                        double        height)
-{
-  SvgPaintable *self = SVG_PAINTABLE (paintable);
-  cairo_t *cr;
-  GError *error = NULL;
-
-  cr = gtk_snapshot_append_cairo (GTK_SNAPSHOT (snapshot),
-                                  &GRAPHENE_RECT_INIT (0, 0, width, height));
-
-  if (!rsvg_handle_render_document (self->handle, cr,
-                                    &(RsvgRectangle) {0, 0, width, height},
-                                    &error))
-    {
-      g_error ("%s", error->message);
-    }
-
-  cairo_destroy (cr);
-}
-
-static int
-svg_paintable_get_intrinsic_width (GdkPaintable *paintable)
-{
-  SvgPaintable *self = SVG_PAINTABLE (paintable);
-  RsvgDimensionData data;
-
-  rsvg_handle_get_dimensions (self->handle, &data);
-
-  return data.width;
-}
-
-static int
-svg_paintable_get_intrinsic_height (GdkPaintable *paintable)
-{
-  SvgPaintable *self = SVG_PAINTABLE (paintable);
-  RsvgDimensionData data;
-
-  rsvg_handle_get_dimensions (self->handle, &data);
-
-  return data.height;
-}
-
-static void
-svg_paintable_init_interface (GdkPaintableInterface *iface)
-{
-  iface->snapshot = svg_paintable_snapshot;
-  iface->get_intrinsic_width = svg_paintable_get_intrinsic_width;
-  iface->get_intrinsic_height = svg_paintable_get_intrinsic_height;
-}
-
-G_DEFINE_TYPE_WITH_CODE (SvgPaintable, svg_paintable, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                svg_paintable_init_interface))
-
-static void
-svg_paintable_init (SvgPaintable *self)
-{
-}
-
-static void
-svg_paintable_dispose (GObject *object)
-{
-  SvgPaintable *self = SVG_PAINTABLE (object);
-
-  g_clear_object (&self->file);
-  g_clear_object (&self->handle);
-
-  G_OBJECT_CLASS (svg_paintable_parent_class)->dispose (object);
-}
-
-static void
-svg_paintable_set_property (GObject      *object,
-                            guint         prop_id,
-                            const GValue *value,
-                            GParamSpec   *pspec)
-{
-  SvgPaintable *self = SVG_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_FILE:
-      {
-        GFile *file = g_value_get_object (value);
-        RsvgHandle *handle = rsvg_handle_new_from_gfile_sync (file,
-                                                              RSVG_HANDLE_FLAGS_NONE,
-                                                              NULL,
-                                                              NULL);
-        rsvg_handle_set_dpi (handle, 90);
-
-        g_set_object (&self->file, file);
-        g_set_object (&self->handle, handle);
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-svg_paintable_get_property (GObject    *object,
-                            guint       prop_id,
-                            GValue     *value,
-                            GParamSpec *pspec)
-{
-  SvgPaintable *self = SVG_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_FILE:
-      g_value_set_object (value, self->file);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-
-static void
-svg_paintable_class_init (SvgPaintableClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->dispose = svg_paintable_dispose;
-  object_class->set_property = svg_paintable_set_property;
-  object_class->get_property = svg_paintable_get_property;
-
-  g_object_class_install_property (object_class, PROP_FILE,
-                                   g_param_spec_object ("file", "File", "File",
-                                                        G_TYPE_FILE,
-                                                        G_PARAM_READWRITE));
-}
-
-static SvgPaintable *
-svg_paintable_new (GFile *file)
-{
-  return g_object_new (SVG_TYPE_PAINTABLE,
-                       "file", file,
-                       NULL);
-}
-
-static void
-file_set (GtkFileChooserButton *button,
-          GtkWidget            *picture)
-{
-  GFile *file;
-  SvgPaintable *paintable;
-
-  file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (button));
-
-  paintable = svg_paintable_new (file);
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (paintable));
-
-  g_object_unref (paintable);
-  g_object_unref (file);
-}
-
-static GtkWidget *window;
-
-GtkWidget *
-do_paintable_svg (GtkWidget *do_widget)
-{
-  GtkWidget *header;
-  GtkWidget *picture;
-  GtkFileFilter *filter;
-  GtkWidget *button;
-  GFile *file;
-  SvgPaintable *paintable;
-
-  if (!window)
-    {
-      window = gtk_window_new ();
-      header = gtk_header_bar_new ();
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-      gtk_window_set_default_size (GTK_WINDOW (window), 300, 200);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      button = gtk_file_chooser_button_new ("Select an SVG file", GTK_FILE_CHOOSER_ACTION_OPEN);
-      filter = gtk_file_filter_new ();
-      gtk_file_filter_add_mime_type (filter, "image/svg+xml");
-      gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (button), filter);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
-
-      picture = gtk_picture_new ();
-      gtk_picture_set_can_shrink (GTK_PICTURE (picture), TRUE);
-      gtk_widget_set_size_request (picture, 16, 16);
-
-      g_signal_connect (button, "file-set", G_CALLBACK (file_set), picture);
-
-      gtk_window_set_child (GTK_WINDOW (window), picture);
-
-      file = g_file_new_for_uri ("resource:///paintable_svg/org.gtk.gtk4.NodeEditor.Devel.svg");
-      paintable = svg_paintable_new (file);
-      gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (paintable));
-      g_object_unref (paintable);
-      g_object_unref (file);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,34 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/Radial
-// License: MIT
-// Author: Xaychru
-
-const float smoothness = 1.0;
-
-const float PI = 3.141592653589;
-
-vec4 transition(vec2 p) {
-  vec2 rp = p*2.-1.;
-  return mix(
-    getToColor(p),
-    getFromColor(p),
-    smoothstep(0., smoothness, atan(rp.y,rp.x) - (progress-.5) * PI * 2.5)
-  );
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -1,43 +0,0 @@
-uniform float u_time;
-uniform vec2 u_mouse;
-uniform sampler2D u_texture1;
-
-#define PI      3.141592654
-
-float decay(float v, float t)
-{
-  return v * (1.0 / (1.0 + t*t));
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  // Temporary to loop time every 1 sec
-  float time = u_time;
-  // we normalize all the effects according to the min height/width
-  float size = min(resolution.x, resolution.y);
-
-  // Animate one wave over size in 0.3 sec
-  float wave_speed = size / 0.3;
-  float wave_length = size / 1.0;
-  float wave_height = size  * 0.1;
-
-  vec2 center = u_mouse;
-  vec2 direction_from_center = fragCoord - center;
-  float distance_from_center = length(direction_from_center);
-
-  /* Normalize direction */
-  direction_from_center = direction_from_center / distance_from_center;
-
-  float propagation_length = time * wave_speed;
-
-  float t = (propagation_length - distance_from_center) / wave_length;
-  float offset_magnitude = 0;
-  if (t > 0.0)
-    offset_magnitude = decay(wave_height * sin(t * 2.0 * PI), t);
-
-  vec2 offset = direction_from_center * min(offset_magnitude, distance_from_center);
-  vec2 source = fragCoord - offset;
-
-  vec2 uv2 = source / resolution;
-  fragColor = GskTexture(u_texture1, vec2(uv2.x, 1.0-uv2.y));
-}
@@ -91,7 +91,7 @@ static struct {
  { G_UNICODE_SCRIPT_LYDIAN, HB_SCRIPT_LYDIAN,  NC_("Script", "Lydian") },
  { G_UNICODE_SCRIPT_AVESTAN, HB_SCRIPT_AVESTAN,  NC_("Script", "Avestan") },
  { G_UNICODE_SCRIPT_BAMUM, HB_SCRIPT_BAMUM,  NC_("Script", "Bamum") },
-  { G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS, HB_SCRIPT_EGYPTIAN_HIEROGLYPHS,  NC_("Script", "Egyptian Hieroglyphs") },
+  { G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS, HB_SCRIPT_EGYPTIAN_HIEROGLYPHS,  NC_("Script", "Egyptian Hieroglpyhs") },
  { G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC, HB_SCRIPT_IMPERIAL_ARAMAIC,  NC_("Script", "Imperial Aramaic") },
  { G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI, HB_SCRIPT_INSCRIPTIONAL_PAHLAVI,  NC_("Script", "Inscriptional Pahlavi") },
  { G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, HB_SCRIPT_INSCRIPTIONAL_PARTHIAN,  NC_("Script", "Inscriptional Parthian") },
@@ -119,7 +119,7 @@ static struct {
  { G_UNICODE_SCRIPT_DUPLOYAN, HB_SCRIPT_DUPLOYAN,  NC_("Script", "Duployan") },
  { G_UNICODE_SCRIPT_ELBASAN, HB_SCRIPT_ELBASAN,  NC_("Script", "Elbasan") },
  { G_UNICODE_SCRIPT_GRANTHA, HB_SCRIPT_GRANTHA,  NC_("Script", "Grantha") },
-  { G_UNICODE_SCRIPT_KHOJKI, HB_SCRIPT_KHOJKI,  NC_("Script", "Khojki") },
+  { G_UNICODE_SCRIPT_KHOJKI, HB_SCRIPT_KHOJKI,  NC_("Script", "Kjohki") },
  { G_UNICODE_SCRIPT_KHUDAWADI, HB_SCRIPT_KHUDAWADI,  NC_("Script", "Khudawadi, Sindhi") },
  { G_UNICODE_SCRIPT_LINEAR_A, HB_SCRIPT_LINEAR_A,  NC_("Script", "Linear A") },
  { G_UNICODE_SCRIPT_MAHAJANI, HB_SCRIPT_MAHAJANI,  NC_("Script", "Mahajani") },
@@ -149,40 +149,10 @@ static struct {
  { G_UNICODE_SCRIPT_NEWA, HB_SCRIPT_NEWA,  NC_("Script", "Newa") },
  { G_UNICODE_SCRIPT_OSAGE, HB_SCRIPT_OSAGE,  NC_("Script", "Osage") },
  { G_UNICODE_SCRIPT_TANGUT, HB_SCRIPT_TANGUT,  NC_("Script", "Tangut") },
-  { G_UNICODE_SCRIPT_MASARAM_GONDI, HB_SCRIPT_MASARAM_GONDI,  NC_("Script", "Masaram Gondi") },
-  { G_UNICODE_SCRIPT_NUSHU, HB_SCRIPT_NUSHU,  NC_("Script", "Nushu") },
-  { G_UNICODE_SCRIPT_SOYOMBO, HB_SCRIPT_SOYOMBO,  NC_("Script", "Soyombo") },
-  { G_UNICODE_SCRIPT_ZANABAZAR_SQUARE, HB_SCRIPT_ZANABAZAR_SQUARE,  NC_("Script", "Zanabazar Square") },
-  { G_UNICODE_SCRIPT_DOGRA, HB_SCRIPT_DOGRA, NC_("Script", "Dogra") },
-  { G_UNICODE_SCRIPT_GUNJALA_GONDI, HB_SCRIPT_GUNJALA_GONDI, NC_("Script", "Gunjala Gondi") },
-  { G_UNICODE_SCRIPT_HANIFI_ROHINGYA, HB_SCRIPT_HANIFI_ROHINGYA, NC_("Script", "Hanifi Rohingya") },
-  { G_UNICODE_SCRIPT_MAKASAR, HB_SCRIPT_MAKASAR, NC_("Script", "Makasar") },
-  { G_UNICODE_SCRIPT_MEDEFAIDRIN, HB_SCRIPT_MEDEFAIDRIN, NC_("Script", "Medefaidrin") },
-  { G_UNICODE_SCRIPT_OLD_SOGDIAN, HB_SCRIPT_OLD_SOGDIAN, NC_("Script", "Old Sogdian") },
-  { G_UNICODE_SCRIPT_SOGDIAN, HB_SCRIPT_SOGDIAN, NC_("Script", "Sogdian") },
-
-#if HB_VERSION_ATLEAST(2,4,0)
-  { G_UNICODE_SCRIPT_ELYMAIC, HB_SCRIPT_ELYMAIC, NC_("Script", "Elym") },
-  { G_UNICODE_SCRIPT_NANDINAGARI, HB_SCRIPT_NANDINAGARI, NC_("Script", "Nand") },
-  { G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG, HB_SCRIPT_NYIAKENG_PUACHUE_HMONG, NC_("Script", "Rohg") },
-  { G_UNICODE_SCRIPT_WANCHO, HB_SCRIPT_WANCHO, NC_("Script", "Wcho") },
-#else
-  { G_UNICODE_SCRIPT_ELYMAIC, HB_SCRIPT_INVALID, NC_("Script", "Elym") },
-  { G_UNICODE_SCRIPT_NANDINAGARI, HB_SCRIPT_INVALID, NC_("Script", "Nand") },
-  { G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG, HB_SCRIPT_INVALID, NC_("Script", "Rohg") },
-  { G_UNICODE_SCRIPT_WANCHO, HB_SCRIPT_INVALID, NC_("Script", "Wcho") },
-#endif
-#if HB_VERSION_ATLEAST(2,6,7)
-  { G_UNICODE_SCRIPT_CHORASMIAN, HB_SCRIPT_CHORASMIAN, NC_("Script", "Chorasmian") },
-  { G_UNICODE_SCRIPT_DIVES_AKURU, HB_SCRIPT_DIVES_AKURU, NC_("Script", "Dives Akuru") },
-  { G_UNICODE_SCRIPT_KHITAN_SMALL_SCRIPT, HB_SCRIPT_KHITAN_SMALL_SCRIPT, NC_("Script", "Khitan small script") },
-  { G_UNICODE_SCRIPT_YEZIDI, HB_SCRIPT_YEZIDI, NC_("Script", "Yezidi") },
-#else
-  { G_UNICODE_SCRIPT_CHORASMIAN, HB_SCRIPT_INVALID, NC_("Script", "Chorasmian") },
-  { G_UNICODE_SCRIPT_DIVES_AKURU, HB_SCRIPT_INVALID, NC_("Script", "Dives Akuru") },
-  { G_UNICODE_SCRIPT_KHITAN_SMALL_SCRIPT, HB_SCRIPT_INVALID, NC_("Script", "Khitan small script") },
-  { G_UNICODE_SCRIPT_YEZIDI, HB_SCRIPT_INVALID, NC_("Script", "Yezidi") },
-#endif
+  { G_UNICODE_SCRIPT_MASARAM_GONDI, HB_SCRIPT_INVALID,  NC_("Script", "Masaram Gondi") },
+  { G_UNICODE_SCRIPT_NUSHU, HB_SCRIPT_INVALID,  NC_("Script", "Nushu") },
+  { G_UNICODE_SCRIPT_SOYOMBO, HB_SCRIPT_INVALID,  NC_("Script", "Soyombo") },
+  { G_UNICODE_SCRIPT_ZANABAZAR_SQUARE, HB_SCRIPT_INVALID,  NC_("Script", "Zanabazar Square") },
 };

 const char *
@@ -193,12 +163,7 @@ get_script_name (GUnicodeScript script)
  for (i = 0; i < G_N_ELEMENTS (scripts); i++)
    {
      if (scripts[i].script == script)
-        {
-          if (scripts[i].name)
-            return g_dpgettext2 (GETTEXT_PACKAGE, "Script", scripts[i].name);
-          else
-            return "";
-        }
+        return g_dpgettext2 (GETTEXT_PACKAGE, "Script", scripts[i].name);
    }

  return NULL;
@@ -8,7 +8,7 @@
        <property name="margin-start">50</property>
        <property name="margin-end">50</property>
        <property name="margin-top">50</property>
-        <property name="margin-bottom">50</property>
+        <property name="margin-end">50</property>
        <property name="spacing">10</property>
        <child>
          <object class="GtkButton">
@@ -545,7 +545,6 @@ recursive_attach_view (int                 depth,
    return;

  child_view = gtk_text_view_new_with_buffer (gtk_text_view_get_buffer (view));
-  gtk_widget_set_size_request (child_view, 260 - 20 * depth, -1);

  /* Frame is to add a black border around each child view */
  frame = gtk_frame_new (NULL);
@@ -591,8 +590,6 @@ easter_egg_callback (GtkWidget *button,
  g_object_unref (buffer);

  window = gtk_window_new ();
-  gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (gtk_widget_get_root (button)));
-  gtk_window_set_modal (GTK_WINDOW (window), TRUE);
  sw = gtk_scrolled_window_new ();
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                  GTK_POLICY_AUTOMATIC,
@@ -1,174 +0,0 @@
-#include "unicode-names.h"
-
-const char *
-get_unicode_type_name (GUnicodeType type)
-{
-  const char *names[] = {
-    "Other, Control",
-    "Other, Format",
-    "Other, Not Assigned",
-    "Other, Private Use",
-    "Other, Surrogate",
-    "Letter, Lowercase",
-    "Letter, Modifier",
-    "Letter, Other",
-    "Letter, Titlecase",
-    "Letter, Uppercase",
-    "Mark, Spacing",
-    "Mark, Enclosing",
-    "Mark, Nonspacing",
-    "Number, Decimal Digit",
-    "Number, Letter",
-    "Number, Other",
-    "Punctuation, Connector",
-    "Punctuation, Dash",
-    "Punctuation, Close",
-    "Punctuation, Final quote",
-    "Punctuation, Initial quote",
-    "Punctuation, Other",
-    "Punctuation, Open",
-    "Symbol, Currency",
-    "Symbol, Modifier",
-    "Symbol, Math",
-    "Symbol, Other",
-    "Separator, Line",
-    "Separator, Paragraph",
-    "Separator, Space",
-  };
-
-  if (type < G_N_ELEMENTS (names))
-    return names[type];
-
-  return "Unknown";
-}
-
-const char *
-get_break_type_name (GUnicodeBreakType type)
-{
-  const char *names[] = {
-    "Mandatory Break",
-    "Carriage Return",
-    "Line Feed",
-    "Attached Characters and Combining Marks",
-    "Surrogates",
-    "Zero Width Space",
-    "Inseparable",
-    "Non-breaking (\"Glue\")",
-    "Contingent Break Opportunity",
-    "Space",
-    "Break Opportunity After",
-    "Break Opportunity Before",
-    "Break Opportunity Before and After",
-    "Hyphen",
-    "Nonstarter",
-    "Opening Punctuation",
-    "Closing Punctuation",
-    "Ambiguous Quotation",
-    "Exclamation/Interrogation",
-    "Ideographic",
-    "Numeric",
-    "Infix Separator (Numeric)",
-    "Symbols Allowing Break After",
-    "Ordinary Alphabetic and Symbol Characters",
-    "Prefix (Numeric)",
-    "Postfix (Numeric)",
-    "Complex Content Dependent (South East Asian)",
-    "Ambiguous (Alphabetic or Ideographic)",
-    "Unknown",
-    "Next Line",
-    "Word Joiner",
-    "Hangul L Jamo",
-    "Hangul V Jamo",
-    "Hangul T Jamo",
-    "Hangul LV Syllable",
-    "Hangul LVT Syllable",
-    "Closing Parenthesis",
-    "Conditional Japanese Starter",
-    "Hebrew Letter",
-    "Regional Indicator",
-    "Emoji Base",
-    "Emoji Modifier",
-    "Zero Width Joiner",
-  };
-
-  if (type < G_N_ELEMENTS (names))
-    return names[type];
-
-  return "Unknown";
-}
-
-const char *
-get_combining_class_name (int cclass)
-{
-  const char *classes[256] = { 0, };
-
-  classes[0] = "Not Reordered";
-  classes[1] = "Overlay";
-  classes[7] = "Nukta";
-  classes[8] = "Kana Voicing";
-  classes[9] = "Virama";
-  classes[10] = "CCC10 (Hebrew)";
-  classes[11] = "CCC11 (Hebrew)";
-  classes[12] = "CCC12 (Hebrew)";
-  classes[13] = "CCC13 (Hebrew)";
-  classes[14] = "CCC14 (Hebrew)";
-  classes[15] = "CCC15 (Hebrew)";
-  classes[16] = "CCC16 (Hebrew)";
-  classes[17] = "CCC17 (Hebrew)";
-  classes[18] = "CCC18 (Hebrew)";
-  classes[19] = "CCC19 (Hebrew)";
-  classes[20] = "CCC20 (Hebrew)";
-  classes[21] = "CCC21 (Hebrew)";
-  classes[22] = "CCC22 (Hebrew)";
-  classes[23] = "CCC23 (Hebrew)";
-  classes[24] = "CCC24 (Hebrew)";
-  classes[25] = "CCC25 (Hebrew)";
-  classes[26] = "CCC26 (Hebrew)";
-
-  classes[27] = "CCC27 (Arabic)";
-  classes[28] = "CCC28 (Arabic)";
-  classes[29] = "CCC29 (Arabic)";
-  classes[30] = "CCC30 (Arabic)";
-  classes[31] = "CCC31 (Arabic)";
-  classes[32] = "CCC32 (Arabic)";
-  classes[33] = "CCC33 (Arabic)";
-  classes[34] = "CCC34 (Arabic)";
-  classes[35] = "CCC35 (Arabic)";
-
-  classes[36] = "CCC36 (Syriac)";
-
-  classes[84] = "CCC84 (Telugu)";
-  classes[85] = "CCC85 (Telugu)";
-
-  classes[103] = "CCC103 (Thai)";
-  classes[107] = "CCC107 (Thai)";
-
-  classes[118] = "CCC118 (Lao)";
-  classes[122] = "CCC122 (Lao)";
-
-  classes[129] = "CCC129 (Tibetan)";
-  classes[130] = "CCC130 (Tibetan)";
-  classes[133] = "CCC133 (Tibetan)";
-
-  classes[200] = "Attached Below Left";
-  classes[202] = "Attached Below";
-  classes[214] = "Attached Above";
-  classes[216] = "Attached Above Right";
-  classes[218] = "Below Left";
-  classes[220] = "Below";
-  classes[222] = "Below Right";
-  classes[224] = "Left";
-  classes[226] = "Right";
-  classes[228] = "Above Left";
-  classes[230] = "Above";
-  classes[232] = "Above Right";
-  classes[233] = "Double Below";
-  classes[234] = "Double Above";
-  classes[240] = "Iota Subscript";
-  classes[255] = "Invalid";
-
-  if (cclass < 256 && classes[cclass] != NULL)
-    return classes[cclass];
-
-  return "Unknown";
-}
@@ -1,7 +0,0 @@
-#pragma once
-
-#include <glib.h>
-
-const char * get_unicode_type_name    (GUnicodeType      type);
-const char * get_break_type_name      (GUnicodeBreakType type);
-const char * get_combining_class_name (int               cclass);
@@ -1,33 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/wind
-// Author: gre
-// License: MIT
-
-const float size = 0.2;
-
-float rand(vec2 co) {
-  return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-}
-
-vec4 transition(vec2 p) {
-  float r = rand(vec2(0, p.y));
-  float m = smoothstep(0.0, -size, p.x*(1.0-size) + size*r - (progress * (1.0 + size)));
-  return mix(getFromColor(p), getToColor(p), m);
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -171,8 +171,6 @@ text_changed (GtkTextBuffer    *buffer,
  GskRenderNode *node;
  char *text;
  GBytes *bytes;
-  GtkTextIter iter;
-  GtkTextIter start, end;

  g_array_remove_range (self->errors, 0, self->errors->len);
  text = get_current_text (self->text_buffer);
@@ -210,6 +208,8 @@ text_changed (GtkTextBuffer    *buffer,
      gtk_picture_set_paintable (GTK_PICTURE (self->picture), NULL);
    }

+  GtkTextIter iter;
+
  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);

  while (!gtk_text_iter_is_end (&iter))
@@ -272,10 +272,6 @@ text_changed (GtkTextBuffer    *buffer,

      gtk_text_iter_forward_char (&iter);
    }
-
-  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens",
-                                     &start, &end);
 }

 static gboolean
@@ -902,11 +898,6 @@ node_editor_window_init (NodeEditorWindow *self)
                                        "name", "number",
                                        "foreground-rgba", &(GdkRGBA) { 0.8, 0.52, 0.43, 1},
                                        NULL));
-  gtk_text_tag_table_add (self->tag_table,
-                          g_object_new (GTK_TYPE_TEXT_TAG,
-                                        "name", "no-hyphens",
-                                        "insert-hyphens", FALSE,
-                                        NULL));

  self->text_buffer = gtk_text_buffer_new (self->tag_table);
  g_signal_connect (self->text_buffer, "changed", G_CALLBACK (text_changed), self);
@@ -517,6 +517,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <child>
                              <object class="GtkEntry" id="entry2">
                                <property name="sensitive">0</property>
+                                <property name="invisible-char">•</property>
                                <property name="text" translatable="yes">entry</property>
                              </object>
                            </child>
@@ -527,7 +528,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                </style>
                                <child>
                                  <object class="GtkEntry" id="entry24">
-                                    <property name="enable-emoji-completion">1</property>
+                                    <property name="invisible-char">•</property>
                                    <property name="text" translatable="yes">entry</property>
                                    <property name="hexpand">1</property>
                                  </object>
@@ -1011,7 +1012,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                        <property name="restrict-to-fill-level">0</property>
                                        <property name="fill-level">75</property>
                                        <property name="digits">-1</property>
-                                        <property name="draw-value">1</property>
                                        <property name="halign">end</property>
                                      </object>
                                    </child>
@@ -1024,7 +1024,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                        <property name="restrict-to-fill-level">0</property>
                                        <property name="fill-level">75</property>
                                        <property name="digits">-1</property>
-                                        <property name="draw-value">1</property>
                                        <property name="halign">start</property>
                                      </object>
                                    </child>
@@ -961,6 +961,7 @@ gdk_wayland_display_query_registry
 gdk_wayland_display_set_cursor_theme
 gdk_wayland_display_get_startup_notification_id
 gdk_wayland_display_set_startup_notification_id
+gdk_wayland_display_prefers_ssd
 gdk_wayland_display_query_registry

 <SUBSECTION Device>
@@ -969,6 +970,7 @@ gdk_wayland_device_get_wl_seat
 gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_keyboard
 gdk_wayland_device_get_node_ath
+gdk_wayland_device_pad_set_feedback

 <SUBSECTION Monitor>
 gdk_wayland_monitor_get_wl_output
@@ -980,6 +982,9 @@ gdk_wayland_toplevel_export_handle
 gdk_wayland_toplevel_unexport_handle
 gdk_wayland_toplevel_set_transient_for_exported
 gdk_wayland_toplevel_set_application_id
+gdk_wayland_toplevel_announce_csd
+gdk_wayland_toplevel_inhibit_idle
+gdk_wayland_toplevel_uninhibit_idle

 <SUBSECTION Standard>
 GDK_TYPE_WAYLAND_DEVICE
@@ -20,7 +20,6 @@
    <xi:include href="xml/GskRenderNode.xml" />
    <xi:include href="xml/GskRoundedRect.xml" />
    <xi:include href="xml/GskTransform.xml" />
-    <xi:include href="xml/GskGLShader.xml" />
  </reference>

  <index id="api-index-full">
@@ -48,7 +48,6 @@ GskShadowNode
 GskTextNode
 GskTextureNode
 GskTransformNode
-GskGLShaderNode
 gsk_render_node_ref
 gsk_render_node_unref
 GskRenderNodeType
@@ -153,11 +152,6 @@ gsk_blur_node_get_radius
 gsk_debug_node_new
 gsk_debug_node_get_child
 gsk_debug_node_get_message
-gsk_gl_shader_node_new
-gsk_gl_shader_node_get_n_children
-gsk_gl_shader_node_get_child
-gsk_gl_shader_node_get_args
-gsk_gl_shader_node_get_shader
 <SUBSECTION Standard>
 GSK_IS_RENDER_NODE
 GSK_RENDER_NODE
@@ -183,7 +177,6 @@ GSK_TYPE_SHADOW_NODE
 GSK_TYPE_TEXT_NODE
 GSK_TYPE_TEXTURE_NODE
 GSK_TYPE_TRANSFORM_NODE
-GSK_TYPE_GLSHADER_NODE
 GskRenderNodeClass
 gsk_blend_node_get_type
 gsk_blur_node_get_type
@@ -209,7 +202,6 @@ gsk_shadow_node_get_type
 gsk_text_node_get_type
 gsk_texture_node_get_type
 gsk_transform_node_get_type
-gsk_gl_shader_node_get_type
 GSK_TYPE_BLEND_MODE
 <SUBSECTION Standard>
 gsk_serialization_error_quark
@@ -274,46 +266,3 @@ gsk_transform_get_type
 gsk_transform_new
 </SECTION>

-<SECTION>
-<FILE>GskGLShader</FILE>
-GskGLShader
-gsk_gl_shader_new_from_bytes
-gsk_gl_shader_new_from_resource
-gsk_gl_shader_compile
-gsk_gl_shader_get_source
-gsk_gl_shader_get_n_textures
-gsk_gl_shader_get_n_uniforms
-gsk_gl_shader_get_uniform_name
-gsk_gl_shader_find_uniform_by_name
-gsk_gl_shader_get_uniform_type
-gsk_gl_shader_get_uniform_offset
-gsk_gl_shader_get_args_size
-
-<SUBSECTION Uniform Data>
-gsk_gl_shader_get_arg_float
-gsk_gl_shader_get_arg_int
-gsk_gl_shader_get_arg_uint
-gsk_gl_shader_get_arg_bool
-gsk_gl_shader_get_arg_vec2
-gsk_gl_shader_get_arg_vec3
-gsk_gl_shader_get_arg_vec4
-gsk_gl_shader_format_args_va
-gsk_gl_shader_format_args
-
-<SUBSECTION Shader Args Builder>
-GskShaderArgsBuilder
-
-gsk_shader_args_builder_new
-gsk_shader_args_builder_to_args
-gsk_shader_args_builder_free_to_args
-gsk_shader_args_builder_unref
-gsk_shader_args_builder_ref
-
-gsk_shader_args_builder_set_float
-gsk_shader_args_builder_set_int
-gsk_shader_args_builder_set_uint
-gsk_shader_args_builder_set_bool
-gsk_shader_args_builder_set_vec2
-gsk_shader_args_builder_set_vec3
-gsk_shader_args_builder_set_vec4
-</SECTION>
@@ -1,3 +1,2 @@
 gsk_render_node_get_type
 gsk_renderer_get_type
-gsk_gl_shader_get_type
@@ -1030,12 +1030,6 @@ gtk_text_get_tabs
 gtk_text_grab_focus_without_selecting
 gtk_text_set_extra_menu
 gtk_text_get_extra_menu
-gtk_text_set_enable_emoji_completion
-gtk_text_get_enable_emoji_completion
-gtk_text_set_propagate_text_width
-gtk_text_get_propagate_text_width
-gtk_text_set_truncate_multiline
-gtk_text_get_truncate_multiline
 <SUBSECTION Private>
 gtk_text_get_type
 </SECTION>
@@ -2786,26 +2780,24 @@ gtk_spin_button_new_with_range
 gtk_spin_button_set_adjustment
 gtk_spin_button_get_adjustment
 gtk_spin_button_set_digits
-gtk_spin_button_get_digits
 gtk_spin_button_set_increments
-gtk_spin_button_get_increments
 gtk_spin_button_set_range
-gtk_spin_button_get_range
 gtk_spin_button_get_value_as_int
 gtk_spin_button_set_value
-gtk_spin_button_get_value
 gtk_spin_button_set_update_policy
-gtk_spin_button_get_update_policy
 gtk_spin_button_set_numeric
-gtk_spin_button_get_numeric
-gtk_spin_button_set_wrap
-gtk_spin_button_get_wrap
-gtk_spin_button_set_snap_to_ticks
-gtk_spin_button_get_snap_to_ticks
-gtk_spin_button_set_climb_rate
-gtk_spin_button_get_climb_rate
 gtk_spin_button_spin
+gtk_spin_button_set_wrap
+gtk_spin_button_set_snap_to_ticks
 gtk_spin_button_update
+gtk_spin_button_get_digits
+gtk_spin_button_get_increments
+gtk_spin_button_get_numeric
+gtk_spin_button_get_range
+gtk_spin_button_get_snap_to_ticks
+gtk_spin_button_get_update_policy
+gtk_spin_button_get_value
+gtk_spin_button_get_wrap
 GTK_INPUT_ERROR
 <SUBSECTION Standard>
 GTK_SPIN_BUTTON
@@ -4307,7 +4299,6 @@ gtk_snapshot_push_blend
 gtk_snapshot_push_blur
 gtk_snapshot_push_shadow
 gtk_snapshot_push_debug
-gtk_snapshot_push_gl_shader
 gtk_snapshot_pop
 gtk_snapshot_save
 gtk_snapshot_restore
@@ -4749,7 +4740,7 @@ gtk_is_initialized
 GTK_PRIORITY_RESIZE

 <SUBSECTION>
-GtkDebugFlags
+GtkDebugFlag
 gtk_get_debug_flags
 gtk_set_debug_flags

@@ -4936,7 +4927,6 @@ GTK_TYPE_ICON_LOOKUP_FLAGS
 GtkIconThemeError
 gtk_icon_theme_new
 gtk_icon_theme_get_for_display
-gtk_icon_theme_get_display
 gtk_icon_theme_set_search_path
 gtk_icon_theme_get_search_path
 gtk_icon_theme_add_search_path
@@ -6150,8 +6140,6 @@ gtk_popover_get_has_arrow
 gtk_popover_set_offset
 gtk_popover_get_offset
 gtk_popover_set_default_widget
-gtk_popover_set_cascade_popdown
-gtk_popover_get_cascade_popdown
 <SUBSECTION Standard>
 GTK_TYPE_POPOVER
 GTK_IS_POPOVER
@@ -220,18 +220,6 @@ replace many uses of gtk_container_add() with equivalent container-specific
 APIs such as gtk_box_pack_start() or gtk_grid_attach(), and thereby reduce
 the amount of work you have to do at the time of the switch.

-### Review your use of icon resources
-
-When using icons as resources, the behavior of GTK 4 is different in one
-respect: Icons that are directly in $APP_ID/icons/ are treated as unthemed
-icons, which also means that symbolic icons are not recolored. If you want
-your icon resources to have icon theme semantics, they need to be placed
-into theme subdirectories such as $APP_ID/icons/16x16/actions or
-$APP_ID/icons/scalable/status.
-
-This location works fine in GTK 3 too, so you can prepare for this change
-before switching to GTK 4.
-
 ## Changes that need to be done at the time of the switch

 This section outlines porting tasks that you need to tackle when
@@ -277,22 +265,15 @@ with surfaces, you may have to change it to call the API in these
 interfaces, depending on whether the surface you are dealing with
 is a toplevel or a popup.

-As part of this reorganization, X11-only concepts such as sticky,
-keep-below, urgency, skip-taskbar or window groups have either been
-removed or moved to X11 backend api. If you need to use them on your
-X11 windows, you will have to use those backend apis or set the
-corresponding X11 properties (as specified in the EWMH) yourself.
+As part of this reorganization, X11-only concepts such as sticky or
+keep-below have been removed. If you need to use them on your X11 windows,
+you will have to set the corresponding X11 properties (as specified in the
+EWMH) yourself. Subsurfaces are only supported with the Wayland backend,
+using gdk_wayland_surface_new_subsurface(). Native and foreign subwindows
+are no longer supported. These concepts were complicating the code and
+could not be supported across backends.

-Subsurfaces are only supported with the Wayland backend, using
-gdk_wayland_surface_new_subsurface(). Native and foreign subwindows
-are no longer supported. These concepts were complicating the code
-and could not be supported across backends.
-
-A number of GdkWindow APIs are no longer available. This includes
-gdk_window_reparent(), gdk_window_set_geometry_hints(), gdk_window_raise(),
-gdk_window_restack(), gdk_window_move(), gdk_window_resize(). If
-you need to manually control the position or stacking of your X11
-windows, you you will have to use Xlib apis.
+gdk_window_reparent() is no longer available.

 A number of minor API cleanups have happened in GdkSurface
 as well. For example, gdk_surface_input_shape_combine_region()
@@ -305,9 +286,9 @@ gdk_toplevel_begin_resize().
 The %GDK_TOPLEVEL_STATE_ICONIFIED value of the #GdkSurfaceState enumeration
 is now %GDK_TOPLEVEL_STATE_MINIMIZED in the #GdkToplevelState enumeration.

-The #GdkWindow functions gdk_window_iconify() and gdk_window_deiconify()
-have been renamed to gdk_toplevel_minimize() and gdk_toplevel_present(),
-respectively.
+The #GdkWindow functions <function>gdk_window_iconify()</function>
+and <function>gdk_window_deiconify()</function> have been renamed to
+gdk_toplevel_minimize() and gdk_toplevel_present(), respectively.

 The behavior of the minimization and unminimization operations have
 not been changed, and they still require support from the underlying
@@ -466,17 +447,6 @@ GtkButtonBox has been removed. Use a GtkBox instead.
 The GtkBox pack-start and -end methods have been replaced by gtk_box_prepend()
 and gtk_box_append(). You can also reorder box children as necessary.

-### Adapt to GtkWindow API changes
-
-Following the GdkSurface changes, a number of GtkWindow APIs that were
-X11-specific have been removed. This includes gtk_window_set_geometry_hints(),
-gtk_window_set_gravity(), gtk_window_move(), gtk_window_parse_geometry(),
-gtk_window_set_keep_above(), gtk_window_set_keep_below(),
-gtk_window_begin_resize_drag(), gtk_window_begin_move_drag().
-Most likely, you should just stop using them. In some cases, you can
-fall back to using the underlying #GdkToplevel APIS (for example,
-gdk_toplevel_begin_resize()).
-
 ### Adapt to GtkHeaderBar and GtkActionBar API changes

 The gtk_header_bar_set_show_close_button() function has been renamed to
@@ -909,15 +879,6 @@ gtk_search_entry_handle_event() has been dropped and replaced by
 gtk_search_entry_set_key_capture_widget() and
 gtk_event_controller_key_forward().

-### Adapt to GtkScale changes
-
-The default value of #GtkScale:draw-value has been changed to %FALSE.
-If you want your scales to draw values, you will have to set this
-property explicitly now.
-
-gtk4-builder-tool can help with this conversion, with the --3to4 option
-of the simplify command.
-
 ### Stop using gtk_window_activate_default()

 The handling of default widgets has been changed, and activating
@@ -1037,14 +998,6 @@ of a #GtkIconInfo. It always returns a paintable in the requested size, and
 never fails. A number of no-longer-relevant lookup flags and API variants
 have been removed.

-Note that while GTK 4 is moving towards #GdkPaintable as a primary API
-for paintable content, it is meant to be a 'pure' content producer, therefore
-a #GtkIconPaintable for a symbolic icon will *not* get recolored depending
-on the context it is rendered it. To properly render a symbolic icon that
-is provided in the form of a #GtkIconPaintable (this can be checked with
-gtk_icon_paintable_is_symbolic()), you have to call
-gtk_icon_paintable_get_icon_name() and set the icon name on a #GtkImage.
-
 ### Update to GtkFileChooser API changes

 GtkFileChooser moved to a GFile-based API. If you need to convert a
@@ -1095,11 +1048,6 @@ getter function to retrieve the buildable ID. If you are
 using gtk_buildable_get_name() you should replace it with
 gtk_buildable_get_buildable_id().

-### Adapt to GtkAboutDialog API changes
-
-GtkAboutDialog now directly derives from GtkWindow, the GtkDialog API can no
-longer be used on it.
-
 ## Changes to consider after the switch

 GTK 4 has a number of new features that you may want to take
@@ -48,28 +48,18 @@ Each role name is part of the #GtkAccessibleRole enumeration.
 | `BUTTON` | A control that performs an action when pressed | #GtkButton, #GtkLinkButton, #GtkExpander |
 | `CHECKBOX` | A control that has three possible value: `true`, `false`, or `undefined` | #GtkCheckButton |
 | `COMBOBOX` | A control that can be expanded to show a list of possible values to select | #GtkComboBox |
-| `COLUMN_HEADER` | A header in a columned list | #GtkColumnView |
 | `DIALOG` | A dialog that prompts the user to enter information or require a response | #GtkDialog and subclasses |
-| `GRID` | A grid of items | #GtkFlowBox, #GtkGridView |
-| `GRID_CELL` | An item in a grid | #GtkFlowBoxChild, #GtkGridView, #GtkColumnView |
 | `IMG` | An image | #GtkImage, #GtkPicture |
 | `LABEL` | A visible name or caption for a user interface component | #GtkLabel |
-| `LIST` | A list of items | #GtkListBox |
-| `LIST_ITEM` | An item in a list | #GtkListBoxRow |
 | `METER` | Represents a value within a known range | #GtkLevelBar |
 | `PROGRESS_BAR` | An element that display progress | #GtkProgressBar |
 | `RADIO` | A checkable input in a group of radio roles | #GtkCheckButton |
-| `ROW` | A row in a columned list | #GtkColumnView |
 | `SCROLLBAR` | A graphical object controlling the scrolling of content | #GtkScrollbar |
 | `SEARCH_BOX` | A text box for entering search criteria | #GtkSearchEntry |
 | `SEPARATOR` | A divider that separates sections of content or groups of items | #GtkSeparator |
 | `SPIN_BUTTON` | A range control that allows seelcting among discrete choices | #GtkSpinButton |
 | `SWITCH` | A control that represents on/off values | #GtkSwitch |
-| `TAB` | A tab in a list of tabs for switching pages | #GtkStackSwitcher, #GtkNotebook |
-| `TAB_LIST` | A list of tabs for switching pages | #GtkStackSwitcher, #GtkNotebook |
-| `TAB_PANEL` | A page in a notebook or stack | #GtkStack |
 | `TEXT_BOX` | A type of input that allows free-form text as its value. | #GtkEntry, #GtkPasswordEntry, #GtkTextView |
-| `TREE_GRID` | A treeview-like columned list | #GtkColumnView |
 | `WINDOW` | An application window | #GtkWindow |
 | `...` | … |

@@ -1,11 +1,15 @@
 if get_option('gtk_doc')
-  glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr')
+  if not meson.version().version_compare('>=0.52.0')
+    error('Building the GTK documentation requires Meson 0.52.0')
+  endif
+
+  glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
  glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')

-  cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix', default_value: '/usr')
+  cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix')
  cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')

-  gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr')
+  gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix')
  gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')

  docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
@@ -1101,14 +1101,11 @@ create_moveresize_surface (MoveResizeData *mv_resize,
  GdkGrabStatus status;
  GdkSeat *seat;
  GdkDevice *pointer;
+  GdkRectangle rect = { -100, -100, 1, 1 };

  g_assert (mv_resize->moveresize_emulation_surface == NULL);

-  mv_resize->moveresize_emulation_surface =
-      _gdk_broadway_display_create_surface (mv_resize->display,
-                                            GDK_SURFACE_TEMP,
-                                            NULL,
-                                            -100, -100, 1, 1);
+  mv_resize->moveresize_emulation_surface = gdk_surface_new_temp (mv_resize->display, &rect);

  gdk_broadway_surface_show (mv_resize->moveresize_emulation_surface, FALSE);

@@ -49,11 +49,11 @@

 /**
 * SECTION:general
- * @Short_description: Library initialization and versioning
+ * @Short_description: Library initialization and miscellaneous functions
 * @Title: General
 *
- * This section describes miscellaneous macros and utility functions
- * related to library versioning, as well as deprecation facilities.
+ * This section describes the GDK initialization functions and miscellaneous
+ * utility functions, as well as deprecation facilities.
 *
 * The GDK and GTK headers annotate deprecated APIs in a way that produces
 * compiler warnings if these deprecated APIs are used. The warnings
@@ -141,7 +141,7 @@ gdk_array(is_empty) (const GdkArray *self)
  return self->end == self->start;
 }

-G_GNUC_UNUSED static inline void
+G_GNUC_UNUSED static void
 gdk_array(reserve) (GdkArray *self,
                    gsize      n)
 {
@@ -178,7 +178,7 @@ gdk_array(reserve) (GdkArray *self,
 #endif
 }

-G_GNUC_UNUSED static inline void
+G_GNUC_UNUSED static void
 gdk_array(splice) (GdkArray *self,
                   gsize      pos,
                   gsize      removed,
@@ -208,10 +208,8 @@ gdk_array(splice) (GdkArray *self,
        memcpy (gdk_array(index) (self, pos),
                additions,
                added * sizeof (_T_));
-#ifndef GDK_ARRAY_NO_MEMSET
      else
        memset (gdk_array(index) (self, pos), 0, added * sizeof (_T_));
-#endif
    }


@@ -281,5 +279,5 @@ gdk_array(get) (const GdkArray *self,
 #undef GDK_ARRAY_NULL_TERMINATED
 #undef GDK_ARRAY_PREALLOC
 #undef GDK_ARRAY_TYPE_NAME
-#undef GDK_ARRAY_NO_MEMSET
+
 #endif
@@ -681,7 +681,7 @@ gdk_clipboard_read_async (GdkClipboard        *clipboard,
 *
 * Finishes an asynchronous clipboard read started with gdk_clipboard_read_async().
 *
- * Returns: (transfer full) (nullable): a #GInputStream or %NULL on error.
+ * Returns: (transfer full): a #GInputStream or %NULL on error.
 **/
 GInputStream *
 gdk_clipboard_read_finish (GdkClipboard  *clipboard,
@@ -385,7 +385,7 @@ gdk_content_formats_match_gtype (const GdkContentFormats *first,
 * in @second. If no matching mime type is found, %NULL is
 * returned.
 *
- * Returns: (nullable): The first common mime type or %NULL if none.
+ * Returns: The first common mime type or %NULL if none.
 **/
 const char *
 gdk_content_formats_match_mime_type (const GdkContentFormats *first,
@@ -131,6 +131,19 @@ gdk_display_real_opened (GdkDisplay *display)
  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
 }

+static void
+gdk_display_real_event_data_copy (GdkDisplay     *display,
+                                  GdkEvent       *src,
+                                  GdkEvent       *dst)
+{
+}
+
+static void
+gdk_display_real_event_data_free (GdkDisplay     *display,
+                                  GdkEvent       *dst)
+{
+}
+
 static GdkSeat *
 gdk_display_real_get_default_seat (GdkDisplay *display)
 {
@@ -152,6 +165,8 @@ gdk_display_class_init (GdkDisplayClass *class)
  class->get_app_launch_context = gdk_display_real_get_app_launch_context;
  class->opened = gdk_display_real_opened;
  class->make_default = gdk_display_real_make_default;
+  class->event_data_copy = gdk_display_real_event_data_copy;
+  class->event_data_free = gdk_display_real_event_data_free;
  class->get_default_seat = gdk_display_real_get_default_seat;

  /**
@@ -393,13 +408,13 @@ gdk_display_is_closed  (GdkDisplay  *display)
  return display->closed;
 }

-/*<private>
+/**
 * gdk_display_get_event:
 * @display: a #GdkDisplay
- *
+ * 
 * Gets the next #GdkEvent to be processed for @display, fetching events from the
 * windowing system if necessary.
- *
+ * 
 * Returns: (nullable) (transfer full): the next #GdkEvent to be processed,
 *   or %NULL if no events are pending
 */
@@ -414,6 +429,33 @@ gdk_display_get_event (GdkDisplay *display)
  return _gdk_event_unqueue (display);
 }

+/**
+ * gdk_display_peek_event:
+ * @display: a #GdkDisplay 
+ * 
+ * Gets a copy of the first #GdkEvent in the @display’s event queue, without
+ * removing the event from the queue.  (Note that this function will
+ * not get more events from the windowing system.  It only checks the events
+ * that have already been moved to the GDK event queue.)
+ * 
+ * Returns: (nullable) (transfer full): the first #GdkEvent on the
+ *   event queue
+ **/
+GdkEvent *
+gdk_display_peek_event (GdkDisplay *display)
+{
+  GList *tmp_list;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  tmp_list = _gdk_event_queue_find_first (display);
+  
+  if (tmp_list != NULL)
+    return gdk_event_ref (tmp_list->data);
+
+  return NULL;
+}
+
 /**
 * gdk_display_put_event:
 * @display: a #GdkDisplay
@@ -1071,6 +1113,23 @@ gdk_display_open (const char *display_name)
                                           display_name);
 }

+/**
+ * gdk_display_has_pending:
+ * @display: a #GdkDisplay
+ *
+ * Returns whether the display has events that are waiting
+ * to be processed.
+ *
+ * Returns: %TRUE if there are events ready to be processed.
+ */
+gboolean
+gdk_display_has_pending (GdkDisplay *display)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
+
+  return GDK_DISPLAY_GET_CLASS (display)->has_pending (display);
+}
+
 gulong
 _gdk_display_get_next_serial (GdkDisplay *display)
 {
@@ -1107,7 +1166,7 @@ gdk_display_notify_startup_complete (GdkDisplay  *display,
 * Gets the startup notification ID for a Wayland display, or %NULL
 * if no ID has been defined.
 *
- * Returns: (nullable): the startup notification ID for @display, or %NULL
+ * Returns: the startup notification ID for @display, or %NULL
 */
 const char *
 gdk_display_get_startup_notification_id (GdkDisplay *display)
@@ -1134,6 +1193,21 @@ _gdk_display_unpause_events (GdkDisplay *display)
  display->event_pause_count--;
 }

+void
+_gdk_display_event_data_copy (GdkDisplay     *display,
+                              GdkEvent       *event,
+                              GdkEvent       *new_event)
+{
+  GDK_DISPLAY_GET_CLASS (display)->event_data_copy (display, event, new_event);
+}
+
+void
+_gdk_display_event_data_free (GdkDisplay *display,
+                              GdkEvent   *event)
+{
+  GDK_DISPLAY_GET_CLASS (display)->event_data_free (display, event);
+}
+
 GdkSurface *
 gdk_display_create_surface (GdkDisplay     *display,
                            GdkSurfaceType  surface_type,
@@ -135,6 +135,11 @@ struct _GdkDisplayClass
                                                         const char *startup_id);
  const char *              (*get_startup_notification_id) (GdkDisplay  *display);

+  void                       (*event_data_copy) (GdkDisplay     *display,
+                                                 GdkEvent       *event,
+                                                 GdkEvent       *new_event);
+  void                       (*event_data_free) (GdkDisplay     *display,
+                                                 GdkEvent       *event);
  GdkSurface *               (*create_surface) (GdkDisplay     *display,
                                                GdkSurfaceType  surface_type,
                                                GdkSurface     *parent,
@@ -203,6 +208,11 @@ void                _gdk_display_pointer_info_foreach (GdkDisplay       *display
 gulong              _gdk_display_get_next_serial      (GdkDisplay       *display);
 void                _gdk_display_pause_events         (GdkDisplay       *display);
 void                _gdk_display_unpause_events       (GdkDisplay       *display);
+void                _gdk_display_event_data_copy      (GdkDisplay       *display,
+                                                       GdkEvent         *event,
+                                                       GdkEvent         *new_event);
+void                _gdk_display_event_data_free      (GdkDisplay       *display,
+                                                       GdkEvent         *event);
 GdkSurface *        gdk_display_create_surface        (GdkDisplay       *display,
                                                       GdkSurfaceType    surface_type,
                                                       GdkSurface       *parent,
@@ -231,6 +241,8 @@ void                gdk_display_setting_changed       (GdkDisplay       *display
                                                       const char       *name);

 GdkEvent *          gdk_display_get_event             (GdkDisplay       *display);
+GdkEvent *          gdk_display_peek_event            (GdkDisplay       *display);
+gboolean            gdk_display_has_pending           (GdkDisplay       *display);

 GdkKeymap *  gdk_display_get_keymap  (GdkDisplay *display);

@@ -147,6 +147,10 @@ value_event_lcopy_value (const GValue *value,
 static void
 gdk_event_finalize (GdkEvent *self)
 {
+  GdkDisplay *display = gdk_event_get_display (self);
+  if (display != NULL)
+    _gdk_display_event_data_free (display, self);
+
  g_clear_object (&self->surface);
  g_clear_object (&self->device);

@@ -27,7 +27,7 @@
 #include <string.h>

 static const char *
-get_shader_type_name (int type)
+get_vertex_type_name (int type)
 {
  switch (type)
    {
@@ -64,7 +64,7 @@ create_shader (int         type,
      buffer = g_malloc (log_len + 1);
      glGetShaderInfoLog (shader, log_len, NULL, buffer);

-      g_warning ("Compile failure in %s shader:\n%s", get_shader_type_name (type), buffer);
+      g_warning ("Compile failure in %s shader:\n%s", get_vertex_type_name (type), buffer);
      g_free (buffer);

      glDeleteShader (shader);
@@ -328,8 +328,10 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
 {
  GdkGLContext *paint_context;
  cairo_surface_t *image;
+  cairo_matrix_t matrix;
  guint framebuffer;
  int alpha_size = 0;
+  cairo_region_t *clip_region;
  GdkGLContextPaintData *paint_data;
  int major, minor, version;
  gboolean es_use_bgra = FALSE;
@@ -341,6 +343,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
      return;
    }

+  clip_region = gdk_cairo_region_from_clip (cr);
  es_use_bgra = gdk_gl_context_use_es_bgra (paint_context);

  gdk_gl_context_make_current (paint_context);
@@ -369,6 +372,8 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
      return;
    }

+  cairo_get_matrix (cr, &matrix);
+
  gdk_gl_context_get_version (paint_context, &major, &minor);
  version = major * 100 + minor;

@@ -377,7 +382,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
   */
  if (gdk_gl_context_get_use_es (paint_context) &&
      !(version >= 300 || gdk_gl_context_has_unpack_subimage (paint_context)))
-    return;
+    goto out;

  /* TODO: avoid reading back non-required data due to dest clip */
  image = cairo_surface_create_similar_image (cairo_get_target (cr),
@@ -419,9 +424,17 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,

  cairo_surface_mark_dirty (image);

+  /* Invert due to opengl having different origin */
+  cairo_scale (cr, 1, -1);
+  cairo_translate (cr, 0, -height / buffer_scale);
+
  cairo_set_source_surface (cr, image, 0, 0);
  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
  cairo_paint (cr);

  cairo_surface_destroy (image);
+
+out:
+  if (clip_region)
+    cairo_region_destroy (clip_region);
 }
@@ -864,6 +864,7 @@ gdk_gl_context_get_use_es (GdkGLContext *context)
  return priv->use_es > 0;
 }

+#ifdef G_ENABLE_CONSISTENCY_CHECKS
 static void
 gl_debug_message_callback (GLenum        source,
                           GLenum        type,
@@ -954,6 +955,7 @@ gl_debug_message_callback (GLenum        source,
  g_warning ("OPENGL:\n    Source: %s\n    Type: %s\n    Severity: %s\n    Message: %s",
             message_source, message_type, message_severity, message);
 }
+#endif

 /**
 * gdk_gl_context_realize:
@@ -1006,22 +1008,15 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
  priv->has_debug_output = epoxy_has_gl_extension ("GL_ARB_debug_output") ||
                           epoxy_has_gl_extension ("GL_KHR_debug");

-#ifdef G_ENABLE_DEBUG
-  display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
-  gl_debug = GDK_DISPLAY_DEBUG_CHECK (display, GL_DEBUG);
-#endif
-
-  if (priv->has_debug_output
-#ifndef G_ENABLE_CONSISTENCY_CHECKS
-      && gl_debug
-#endif
-      )
+#ifdef G_ENABLE_CONSISTENCY_CHECKS
+  if (priv->has_debug_output)
    {
      gdk_gl_context_make_current (context);
      glEnable (GL_DEBUG_OUTPUT);
      glEnable (GL_DEBUG_OUTPUT_SYNCHRONOUS);
      glDebugMessageCallback (gl_debug_message_callback, NULL);
    }
+#endif

  if (priv->use_es)
    {
@@ -1044,6 +1039,11 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
        priv->is_legacy = TRUE;
    }

+#ifdef G_ENABLE_DEBUG
+  display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
+  gl_debug = GDK_DISPLAY_DEBUG_CHECK (display, GL_DEBUG);
+#endif
+
  if (priv->has_khr_debug && gl_debug)
    {
      priv->use_khr_debug = TRUE;
@@ -30,3 +30,4 @@
 #include <stdio.h>

 guint               _gdk_debug_flags = 0;
+GList              *_gdk_default_filters = NULL;
@@ -30,6 +30,7 @@ struct _GdkGLTexture {

  GdkGLContext *context;
  guint id;
+  gboolean is_fbo;

  cairo_surface_t *saved;

@@ -196,6 +197,7 @@ gdk_gl_texture_release (GdkGLTexture *self)
 GdkTexture *
 gdk_gl_texture_new (GdkGLContext   *context,
                    guint           id,
+                    gboolean        is_fbo,
                    int             width,
                    int             height,
                    GDestroyNotify  destroy,
@@ -215,9 +217,15 @@ gdk_gl_texture_new (GdkGLContext   *context,

  self->context = g_object_ref (context);
  self->id = id;
+  self->is_fbo = is_fbo;
  self->destroy = destroy;
  self->data = data;

  return GDK_TEXTURE (self);
 }

+gboolean
+gdk_gl_texture_is_fbo (GdkGLTexture *texture)
+{
+  return texture->is_fbo;
+}
@@ -44,6 +44,7 @@ GType                   gdk_gl_texture_get_type                (void) G_GNUC_CON
 GDK_AVAILABLE_IN_ALL
 GdkTexture *            gdk_gl_texture_new                     (GdkGLContext    *context,
                                                                guint            id,
+                                                                gboolean         is_fbo,
                                                                int              width,
                                                                int              height,
                                                                GDestroyNotify   destroy,
@@ -52,6 +53,8 @@ GdkTexture *            gdk_gl_texture_new                     (GdkGLContext
 GDK_AVAILABLE_IN_ALL
 void                    gdk_gl_texture_release                 (GdkGLTexture    *self);

+GDK_AVAILABLE_IN_ALL
+gboolean                gdk_gl_texture_is_fbo                  (GdkGLTexture    *self);

 G_END_DECLS

@@ -78,7 +78,6 @@ GDK_AVAILABLE_IN_ALL
 GList *        gdk_seat_get_devices             (GdkSeat             *seat,
                                                 GdkSeatCapabilities  capabilities);

-GDK_AVAILABLE_IN_ALL
 GList *        gdk_seat_get_tools               (GdkSeat *seat);

 GDK_AVAILABLE_IN_ALL
@@ -816,6 +816,29 @@ gdk_surface_new_toplevel (GdkDisplay *display)
                          NULL, 0, 0, 1, 1);
 }

+/**
+ * gdk_surface_new_temp: (constructor)
+ * @display: the display to create the surface on
+ * @position: position of the surface on screen
+ *
+ * Creates a new temporary surface.
+ * The surface will bypass surface management.
+ *
+ * Returns: (transfer full): the new #GdkSurface
+ **/
+GdkSurface *
+gdk_surface_new_temp (GdkDisplay         *display,
+                      const GdkRectangle *position)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (position != NULL, NULL);
+
+  return gdk_surface_new (display, GDK_SURFACE_TEMP,
+                          NULL,
+                          position->x, position->y,
+                          position->width, position->height);
+}
+
 /**
 * gdk_surface_new_popup: (constructor)
 * @parent: the parent surface to attach the surface to
@@ -277,6 +277,9 @@ void       gdk_surface_enter_monitor (GdkSurface *surface,
 void       gdk_surface_leave_monitor (GdkSurface *surface,
                                      GdkMonitor *monitor);

+GdkSurface *   gdk_surface_new_temp             (GdkDisplay    *display,
+                                                 const GdkRectangle *position);
+
 void gdk_surface_destroy_notify       (GdkSurface *surface);

 void gdk_synthesize_surface_state (GdkSurface     *surface,
@@ -30,6 +30,19 @@
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacossurface-private.h"

+/* Text Input Client */
+#define TIC_MARKED_TEXT      "tic-marked-text"
+#define TIC_SELECTED_POS     "tic-selected-pos"
+#define TIC_SELECTED_LEN     "tic-selected-len"
+#define TIC_INSERT_TEXT      "tic-insert-text"
+#define TIC_IN_KEY_DOWN      "tic-in-key-down"
+
+/* GtkIMContext */
+#define GIC_CURSOR_RECT      "gic-cursor-rect"
+#define GIC_FILTER_KEY       "gic-filter-key"
+#define GIC_FILTER_PASSTHRU  0
+#define GIC_FILTER_FILTERED  1
+
@implementation GdkMacosBaseView

 -(id)initWithFrame:(NSRect)frameRect
@@ -28,7 +28,6 @@
 #import "GdkMacosWindow.h"

 #include "gdkmacosdisplay-private.h"
-#include "gdkmacosmonitor-private.h"
 #include "gdkmacossurface-private.h"
 #include "gdkmacospopupsurface-private.h"
 #include "gdkmacostoplevelsurface-private.h"
@@ -126,6 +125,8 @@
      GdkDisplay *display = gdk_surface_get_display (GDK_SURFACE (gdk_surface));
      double time = ((double)[event timestamp]) * 1000.0;

+      _gdk_macos_display_break_all_grabs (GDK_MACOS_DISPLAY (display), time);
+
      inManualMove = NO;
      inManualResize = NO;
      inMove = NO;
@@ -138,8 +139,6 @@
       */
      _gdk_macos_display_send_button_event ([self gdkDisplay], event);

-      _gdk_macos_display_break_all_grabs (GDK_MACOS_DISPLAY (display), time);
-
      break;
    }

@@ -353,7 +352,7 @@
  monitor = _gdk_macos_display_get_monitor_at_display_coords ([self gdkDisplay],
                                                              currentLocation.x,
                                                              currentLocation.y);
-  gdk_monitor_get_geometry (monitor, &geometry);
+  gdk_macos_monitor_get_geometry (monitor, &geometry);
  gdk_macos_monitor_get_workarea (monitor, &workarea);
  _edge_snapping_set_monitor (&self->snapping, &geometry, &workarea);

@@ -28,9 +28,8 @@

 #include "gdkmacoscursor-private.h"
 #include "gdkmacosdevice.h"
-#include "gdkmacosdevice-private.h"
 #include "gdkmacosdisplay-private.h"
-#include "gdkmacossurface-private.h"
+#include "gdkmacosdevice-private.h"

 struct _GdkMacosDevice
 {
@@ -30,19 +30,6 @@

 G_BEGIN_DECLS

-/* Text Input Client */
-#define TIC_MARKED_TEXT      "tic-marked-text"
-#define TIC_SELECTED_POS     "tic-selected-pos"
-#define TIC_SELECTED_LEN     "tic-selected-len"
-#define TIC_INSERT_TEXT      "tic-insert-text"
-#define TIC_IN_KEY_DOWN      "tic-in-key-down"
-
-/* GtkIMContext */
-#define GIC_CURSOR_RECT      "gic-cursor-rect"
-#define GIC_FILTER_KEY       "gic-filter-key"
-#define GIC_FILTER_PASSTHRU  0
-#define GIC_FILTER_FILTERED  1
-
 struct _GdkMacosDisplay
 {
  GdkDisplay parent_instance;
@@ -161,7 +148,6 @@ void             _gdk_macos_display_send_button_event              (GdkMacosDisp
 void             _gdk_macos_display_warp_pointer                   (GdkMacosDisplay *self,
                                                                    int              x,
                                                                    int              y);
-NSEvent         *_gdk_macos_display_get_nsevent                    (GdkEvent        *event);

 G_END_DECLS

@@ -209,6 +209,11 @@ fill_button_event (GdkMacosDisplay *display,
  g_assert (GDK_IS_MACOS_DISPLAY (display));
  g_assert (GDK_IS_MACOS_SURFACE (surface));

+  /* Ignore button events outside the window coords */
+  if (x < 0 || x > GDK_SURFACE (surface)->width ||
+      y < 0 || y > GDK_SURFACE (surface)->height)
+    return NULL;
+
  seat = gdk_display_get_default_seat (GDK_DISPLAY (display));
  state = get_keyboard_modifiers_from_ns_event (nsevent) |
         _gdk_macos_display_get_current_mouse_modifiers (display);
@@ -233,18 +238,11 @@ fill_button_event (GdkMacosDisplay *display,
      g_assert_not_reached ();
    }

-  /* Ignore button press events outside the window coords but
-   * allow for button release which can happen during grabs.
-   */
-  if (type == GDK_BUTTON_PRESS &&
-      (x < 0 || x > GDK_SURFACE (surface)->width ||
-       y < 0 || y > GDK_SURFACE (surface)->height))
-    return NULL;
-
  return gdk_button_event_new (type,
                               GDK_SURFACE (surface),
                               gdk_seat_get_pointer (seat),
                               NULL,
+                               NULL,
                               get_time_from_ns_event (nsevent),
                               state,
                               get_mouse_button_from_ns_event (nsevent),
@@ -285,6 +283,7 @@ synthesize_crossing_event (GdkMacosDisplay *display,
  return gdk_crossing_event_new (event_type,
                                 GDK_SURFACE (surface),
                                 gdk_seat_get_pointer (seat),
+                                 NULL,
                                 get_time_from_ns_event (nsevent),
                                 state,
                                 x,
@@ -411,6 +410,7 @@ fill_key_event (GdkMacosDisplay *display,
  return gdk_key_event_new (type,
                            GDK_SURFACE (surface),
                            gdk_seat_get_keyboard (seat),
+                            NULL,
                            get_time_from_ns_event (nsevent),
                            [nsevent keyCode],
                            state,
@@ -526,6 +526,7 @@ fill_pinch_event (GdkMacosDisplay *display,

  return gdk_touchpad_event_new_pinch (GDK_SURFACE (surface),
                                       gdk_seat_get_pointer (seat),
+                                       NULL,
                                       get_time_from_ns_event (nsevent),
                                       get_keyboard_modifiers_from_ns_event (nsevent),
                                       phase,
@@ -569,6 +570,7 @@ fill_motion_event (GdkMacosDisplay *display,
  return gdk_motion_event_new (GDK_SURFACE (surface),
                               gdk_seat_get_pointer (seat),
                               NULL,
+                               NULL,
                               get_time_from_ns_event (nsevent),
                               state,
                               x,
@@ -607,13 +609,21 @@ fill_scroll_event (GdkMacosDisplay *self,
      double sx;
      double sy;

-      sx = [nsevent scrollingDeltaX];
-      sy = [nsevent scrollingDeltaY];
+      /*
+       * TODO: We probably need another event type for the
+       *       high precision scroll events since sx and dy
+       *       are in a unit we don't quite support. For now,
+       *       to slow it down multiply by .1.
+       */
+
+      sx = [nsevent scrollingDeltaX] * .1;
+      sy = [nsevent scrollingDeltaY] * .1;

      if (sx != 0.0 || dx != 0.0)
        ret = gdk_scroll_event_new (GDK_SURFACE (surface),
                                    pointer,
                                    NULL,
+                                    NULL,
                                    get_time_from_ns_event (nsevent),
                                    state,
                                    -sx,
@@ -651,6 +661,7 @@ fill_scroll_event (GdkMacosDisplay *self,
          emulated = gdk_scroll_event_new_discrete (GDK_SURFACE (surface),
                                                    pointer,
                                                    NULL,
+                                                    NULL,
                                                    get_time_from_ns_event (nsevent),
                                                    state,
                                                    direction,
@@ -664,6 +675,7 @@ fill_scroll_event (GdkMacosDisplay *self,
          ret = gdk_scroll_event_new (GDK_SURFACE (surface),
                                      pointer,
                                      NULL,
+                                      NULL,
                                      get_time_from_ns_event (nsevent),
                                      state,
                                      dx,
@@ -713,23 +725,29 @@ find_surface_under_pointer (GdkMacosDisplay *self,
                            int             *y)
 {
  GdkPointerSurfaceInfo *info;
-  GdkMacosSurface *found;
-  GdkSurface *surface = NULL;
+  GdkSurface *surface;
  GdkSeat *seat;
  int x_tmp, y_tmp;

  seat = gdk_display_get_default_seat (GDK_DISPLAY (self));
  info = _gdk_display_get_pointer_info (GDK_DISPLAY (self),
                                        gdk_seat_get_pointer (seat));
+  surface = info->surface_under_pointer;

-  if ((found = _gdk_macos_display_get_surface_at_display_coords (self,
-                                                                 screen_point.x,
-                                                                 screen_point.y,
-                                                                 &x_tmp,
-                                                                 &y_tmp)))
+  if (surface == NULL)
    {
-      g_set_object (&info->surface_under_pointer, surface);
-      surface = GDK_SURFACE (found);
+      GdkMacosSurface *found;
+
+      found = _gdk_macos_display_get_surface_at_display_coords (self,
+                                                                screen_point.x,
+                                                                screen_point.y,
+                                                                &x_tmp, &y_tmp);
+
+      if (found)
+        {
+          surface = GDK_SURFACE (found);
+          info->surface_under_pointer = g_object_ref (surface);
+        }
    }

  if (surface)
@@ -1117,21 +1135,10 @@ _gdk_macos_display_translate (GdkMacosDisplay *self,
      break;

    case NSEventTypeMouseExited:
+      [[NSCursor arrowCursor] set];
+      /* fallthrough */
    case NSEventTypeMouseEntered:
-      {
-        GdkSeat *seat = gdk_display_get_default_seat (GDK_DISPLAY (self));
-        GdkDevice *pointer = gdk_seat_get_pointer (seat);
-        GdkDeviceGrabInfo *grab = _gdk_display_get_last_device_grab (GDK_DISPLAY (self), pointer);
-
-        if (grab == NULL)
-          {
-            if (event_type == NSEventTypeMouseExited)
-              [[NSCursor arrowCursor] set];
-
-            ret = synthesize_crossing_event (self, surface, nsevent, x, y);
-          }
-      }
-
+      ret = synthesize_crossing_event (self, surface, nsevent, x, y);
      break;

    case NSEventTypeKeyDown:
@@ -1181,14 +1188,14 @@ _gdk_macos_display_synthesize_motion (GdkMacosDisplay *self,
  event = gdk_motion_event_new (GDK_SURFACE (surface),
                                gdk_seat_get_pointer (seat),
                                NULL,
+                                NULL,
                                get_time_from_ns_event ([NSApp currentEvent]),
                                state,
                                x,
                                y,
                                NULL);
  node = _gdk_event_queue_append (GDK_DISPLAY (self), event);
-  _gdk_windowing_got_event (GDK_DISPLAY (self), node, event,
-                            _gdk_display_get_next_serial (GDK_DISPLAY (self)));
+  _gdk_windowing_got_event (GDK_DISPLAY (self), node, event, 0);
 }

 void
@@ -74,17 +74,7 @@

 G_DEFINE_TYPE (GdkMacosDisplay, gdk_macos_display, GDK_TYPE_DISPLAY)

-#define EVENT_MAP_MAX_SIZE 10
-
-typedef struct
-{
-  GList     link;
-  GdkEvent *gdk_event;
-  NSEvent  *nsevent;
-} GdkToNSEventMap;
-
 static GSource *event_source;
-static GQueue event_map = G_QUEUE_INIT;

 static GdkMacosMonitor *
 get_monitor (GdkMacosDisplay *self,
@@ -380,8 +370,7 @@ gdk_macos_display_sync (GdkDisplay *display)
 static gulong
 gdk_macos_display_get_next_serial (GdkDisplay *display)
 {
-  static gulong serial = 0;
-  return ++serial;
+  return 0;
 }

 static gboolean
@@ -398,28 +387,6 @@ gdk_macos_display_notify_startup_complete (GdkDisplay  *display,
  /* Not Supported */
 }

-static void
-push_nsevent (GdkEvent *gdk_event,
-              NSEvent  *nsevent)
-{
-  GdkToNSEventMap *map = g_slice_new0 (GdkToNSEventMap);
-
-  map->link.data = map;
-  map->gdk_event = gdk_event_ref (gdk_event);
-  map->nsevent = g_steal_pointer (&nsevent);
-
-  g_queue_push_tail_link (&event_map, &map->link);
-
-  if (event_map.length > EVENT_MAP_MAX_SIZE)
-    {
-      map = g_queue_pop_head_link (&event_map)->data;
-
-      gdk_event_unref (map->gdk_event);
-      [map->nsevent release];
-      g_slice_free (GdkToNSEventMap, map);
-    }
-}
-
 static void
 gdk_macos_display_queue_events (GdkDisplay *display)
 {
@@ -433,18 +400,14 @@ gdk_macos_display_queue_events (GdkDisplay *display)
      GdkEvent *event = _gdk_macos_display_translate (self, nsevent);

      if (event != NULL)
-        {
-          push_nsevent (event, nsevent);
-          _gdk_windowing_got_event (GDK_DISPLAY (self),
-                                    _gdk_event_queue_append (GDK_DISPLAY (self), event),
-                                    event,
-                                    _gdk_display_get_next_serial (GDK_DISPLAY (self)));
-        }
+        _gdk_windowing_got_event (GDK_DISPLAY (self),
+                                  _gdk_event_queue_append (GDK_DISPLAY (self), event),
+                                  event,
+                                  0);
      else
-        {
-          [NSApp sendEvent:nsevent];
-          [nsevent release];
-        }
+        [NSApp sendEvent:nsevent];
+
+      [nsevent release];
    }
 }

@@ -504,7 +467,7 @@ _gdk_macos_display_surface_became_key (GdkMacosDisplay *self,

  seat = gdk_display_get_default_seat (GDK_DISPLAY (self));
  keyboard = gdk_seat_get_keyboard (seat);
-  event = gdk_focus_event_new (GDK_SURFACE (surface), keyboard, TRUE);
+  event = gdk_focus_event_new (GDK_SURFACE (surface), keyboard, NULL, TRUE);
  _gdk_event_queue_append (GDK_DISPLAY (self), event);

  /* We just became the active window.  Unlike X11, Mac OS X does
@@ -530,7 +493,7 @@ _gdk_macos_display_surface_resigned_key (GdkMacosDisplay *self,

      seat = gdk_display_get_default_seat (GDK_DISPLAY (self));
      keyboard = gdk_seat_get_keyboard (seat);
-      event = gdk_focus_event_new (GDK_SURFACE (surface), keyboard, FALSE);
+      event = gdk_focus_event_new (GDK_SURFACE (surface), keyboard, NULL, FALSE);
      _gdk_event_queue_append (GDK_DISPLAY (self), event);
    }

@@ -898,11 +861,11 @@ _gdk_macos_display_break_all_grabs (GdkMacosDisplay *self,

          event = gdk_grab_broken_event_new (grab->surface,
                                             device,
+                                             NULL,
                                             grab->surface,
                                             TRUE);
          node = _gdk_event_queue_append (GDK_DISPLAY (self), event);
-          _gdk_windowing_got_event (GDK_DISPLAY (self), node, event,
-                                    _gdk_display_get_next_serial (GDK_DISPLAY (self)));
+          _gdk_windowing_got_event (GDK_DISPLAY (self), node, event, 0);
        }
    }
 }
@@ -1106,17 +1069,3 @@ _gdk_macos_display_warp_pointer (GdkMacosDisplay *self,

  CGWarpMouseCursorPosition ((CGPoint) { x, y });
 }
-
-NSEvent *
-_gdk_macos_display_get_nsevent (GdkEvent *event)
-{
-  for (const GList *iter = event_map.head; iter; iter = iter->next)
-    {
-      const GdkToNSEventMap *map = iter->data;
-
-      if (map->gdk_event == event)
-        return map->nsevent;
-    }
-
-  return NULL;
-}
@@ -30,7 +30,6 @@ G_BEGIN_DECLS
 GdkMacosKeymap *_gdk_macos_keymap_new            (GdkMacosDisplay *display);
 GdkEventType    _gdk_macos_keymap_get_event_type (NSEvent         *event);
 gboolean        _gdk_macos_keymap_is_modifier    (guint            keycode);
-gunichar        _gdk_macos_keymap_get_equivalent (guint            key);

 G_END_DECLS

@@ -696,150 +696,3 @@ _gdk_macos_keymap_is_modifier (guint keycode)

  return FALSE;
 }
-
-/*
- * Code for key code conversion
- *
- * Copyright (C) 2009 Paul Davis
- */
-gunichar
-_gdk_macos_keymap_get_equivalent (guint key)
-{
-  if (key >= GDK_KEY_A && key <= GDK_KEY_Z)
-    return key + (GDK_KEY_a - GDK_KEY_A);
-
-  if (key >= GDK_KEY_space && key <= GDK_KEY_asciitilde)
-    return key;
-
-  switch (key)
-    {
-      case GDK_KEY_BackSpace:
-        return NSBackspaceCharacter;
-      case GDK_KEY_Delete:
-        return NSDeleteFunctionKey;
-      case GDK_KEY_Pause:
-        return NSPauseFunctionKey;
-      case GDK_KEY_Scroll_Lock:
-        return NSScrollLockFunctionKey;
-      case GDK_KEY_Sys_Req:
-        return NSSysReqFunctionKey;
-      case GDK_KEY_Home:
-        return NSHomeFunctionKey;
-      case GDK_KEY_Left:
-      case GDK_KEY_leftarrow:
-        return NSLeftArrowFunctionKey;
-      case GDK_KEY_Up:
-      case GDK_KEY_uparrow:
-        return NSUpArrowFunctionKey;
-      case GDK_KEY_Right:
-      case GDK_KEY_rightarrow:
-        return NSRightArrowFunctionKey;
-      case GDK_KEY_Down:
-      case GDK_KEY_downarrow:
-        return NSDownArrowFunctionKey;
-      case GDK_KEY_Page_Up:
-        return NSPageUpFunctionKey;
-      case GDK_KEY_Page_Down:
-        return NSPageDownFunctionKey;
-      case GDK_KEY_End:
-        return NSEndFunctionKey;
-      case GDK_KEY_Begin:
-        return NSBeginFunctionKey;
-      case GDK_KEY_Select:
-        return NSSelectFunctionKey;
-      case GDK_KEY_Print:
-        return NSPrintFunctionKey;
-      case GDK_KEY_Execute:
-        return NSExecuteFunctionKey;
-      case GDK_KEY_Insert:
-        return NSInsertFunctionKey;
-      case GDK_KEY_Undo:
-        return NSUndoFunctionKey;
-      case GDK_KEY_Redo:
-        return NSRedoFunctionKey;
-      case GDK_KEY_Menu:
-        return NSMenuFunctionKey;
-      case GDK_KEY_Find:
-        return NSFindFunctionKey;
-      case GDK_KEY_Help:
-        return NSHelpFunctionKey;
-      case GDK_KEY_Break:
-        return NSBreakFunctionKey;
-      case GDK_KEY_Mode_switch:
-        return NSModeSwitchFunctionKey;
-      case GDK_KEY_F1:
-        return NSF1FunctionKey;
-      case GDK_KEY_F2:
-        return NSF2FunctionKey;
-      case GDK_KEY_F3:
-        return NSF3FunctionKey;
-      case GDK_KEY_F4:
-        return NSF4FunctionKey;
-      case GDK_KEY_F5:
-        return NSF5FunctionKey;
-      case GDK_KEY_F6:
-        return NSF6FunctionKey;
-      case GDK_KEY_F7:
-        return NSF7FunctionKey;
-      case GDK_KEY_F8:
-        return NSF8FunctionKey;
-      case GDK_KEY_F9:
-        return NSF9FunctionKey;
-      case GDK_KEY_F10:
-        return NSF10FunctionKey;
-      case GDK_KEY_F11:
-        return NSF11FunctionKey;
-      case GDK_KEY_F12:
-        return NSF12FunctionKey;
-      case GDK_KEY_F13:
-        return NSF13FunctionKey;
-      case GDK_KEY_F14:
-        return NSF14FunctionKey;
-      case GDK_KEY_F15:
-        return NSF15FunctionKey;
-      case GDK_KEY_F16:
-        return NSF16FunctionKey;
-      case GDK_KEY_F17:
-        return NSF17FunctionKey;
-      case GDK_KEY_F18:
-        return NSF18FunctionKey;
-      case GDK_KEY_F19:
-        return NSF19FunctionKey;
-      case GDK_KEY_F20:
-        return NSF20FunctionKey;
-      case GDK_KEY_F21:
-        return NSF21FunctionKey;
-      case GDK_KEY_F22:
-        return NSF22FunctionKey;
-      case GDK_KEY_F23:
-        return NSF23FunctionKey;
-      case GDK_KEY_F24:
-        return NSF24FunctionKey;
-      case GDK_KEY_F25:
-        return NSF25FunctionKey;
-      case GDK_KEY_F26:
-        return NSF26FunctionKey;
-      case GDK_KEY_F27:
-        return NSF27FunctionKey;
-      case GDK_KEY_F28:
-        return NSF28FunctionKey;
-      case GDK_KEY_F29:
-        return NSF29FunctionKey;
-      case GDK_KEY_F30:
-        return NSF30FunctionKey;
-      case GDK_KEY_F31:
-        return NSF31FunctionKey;
-      case GDK_KEY_F32:
-        return NSF32FunctionKey;
-      case GDK_KEY_F33:
-        return NSF33FunctionKey;
-      case GDK_KEY_F34:
-        return NSF34FunctionKey;
-      case GDK_KEY_F35:
-        return NSF35FunctionKey;
-      default:
-        break;
-    }
-
-  return '\0';
-}
@@ -36,13 +36,10 @@ typedef struct _GdkMacosMonitorClass GdkMacosMonitorClass;
 #define GDK_IS_MACOS_MONITOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MACOS_MONITOR))

 GDK_AVAILABLE_IN_ALL
-GType gdk_macos_monitor_get_type     (void);
-GDK_AVAILABLE_IN_ALL
-void  gdk_macos_monitor_get_geometry (GdkMonitor   *self,
-                                      GdkRectangle *geometry);
-GDK_AVAILABLE_IN_ALL
-void  gdk_macos_monitor_get_workarea (GdkMonitor   *self,
-                                      GdkRectangle *geometry);
+GType gdk_macos_monitor_get_type (void);
+
+void gdk_macos_monitor_get_workarea (GdkMonitor   *monitor,
+                                     GdkRectangle *geometry);

 G_END_DECLS

@@ -25,7 +25,6 @@
 #include "gdkpopupprivate.h"

 #include "gdkmacosdisplay-private.h"
-#include "gdkmacosmonitor.h"
 #include "gdkmacospopupsurface-private.h"
 #include "gdkmacosutils-private.h"

@@ -55,15 +54,14 @@ gdk_macos_popup_surface_layout (GdkMacosPopupSurface *self,
  g_assert (layout != NULL);
  g_assert (GDK_SURFACE (self)->parent);

-  gdk_popup_layout_ref (layout);
-  g_clear_pointer (&self->layout, gdk_popup_layout_unref);
-  self->layout = layout;
+  if (layout != self->layout)
+    {
+      g_clear_pointer (&self->layout, gdk_popup_layout_unref);
+      self->layout = gdk_popup_layout_ref (layout);
+    }

-  monitor = gdk_surface_get_layout_monitor (GDK_SURFACE (self),
-                                            self->layout,
+  monitor = gdk_surface_get_layout_monitor (surface, layout,
                                            gdk_macos_monitor_get_workarea);
-  if (monitor == NULL)
-    monitor = _gdk_macos_surface_get_best_monitor (GDK_MACOS_SURFACE (self));
  gdk_macos_monitor_get_workarea (monitor, &bounds);

  gdk_surface_layout_popup_helper (GDK_SURFACE (self),
@@ -71,7 +69,7 @@ gdk_macos_popup_surface_layout (GdkMacosPopupSurface *self,
                                   height,
                                   monitor,
                                   &bounds,
-                                   self->layout,
+                                   layout,
                                   &final_rect);

  gdk_surface_get_origin (GDK_SURFACE (self)->parent, &x, &y);
@@ -121,6 +119,8 @@ gdk_macos_popup_surface_present (GdkPopup       *popup,

  gdk_macos_popup_surface_layout (self, width, height, layout);

+  GDK_MACOS_SURFACE (self)->did_initial_present = TRUE;
+
  if (GDK_SURFACE_IS_MAPPED (GDK_SURFACE (self)))
    return TRUE;

@@ -142,8 +142,6 @@ gdk_macos_popup_surface_present (GdkPopup       *popup,
      show_popup (GDK_MACOS_POPUP_SURFACE (self));
    }

-  GDK_MACOS_SURFACE (self)->did_initial_present = TRUE;
-
  return GDK_SURFACE_IS_MAPPED (GDK_SURFACE (self));
 }

@@ -84,7 +84,7 @@ _gdk_macos_surface_reposition_children (GdkMacosSurface *self)
        _gdk_macos_popup_surface_reposition (GDK_MACOS_POPUP_SURFACE (child));
    }

-  if (GDK_IS_POPUP (self) && self->did_initial_present)
+  if (GDK_IS_POPUP (self) || self->did_initial_present)
    g_signal_emit_by_name (self, "popup-layout-changed");
 }

@@ -238,6 +238,8 @@ gdk_macos_surface_get_device_state (GdkSurface      *surface,
  GdkDisplay *display;
  NSWindow *nswindow;
  NSPoint point;
+  int x_tmp;
+  int y_tmp;

  g_assert (GDK_IS_MACOS_SURFACE (surface));
  g_assert (GDK_IS_MACOS_DEVICE (device));
@@ -245,20 +247,18 @@ gdk_macos_surface_get_device_state (GdkSurface      *surface,
  g_assert (y != NULL);
  g_assert (mask != NULL);

-  if (GDK_SURFACE_DESTROYED (surface))
-    return FALSE;
-
  display = gdk_surface_get_display (surface);
  nswindow = _gdk_macos_surface_get_native (GDK_MACOS_SURFACE (surface));
  point = [nswindow mouseLocationOutsideOfEventStream];

-  *mask = _gdk_macos_display_get_current_keyboard_modifiers (GDK_MACOS_DISPLAY (display))
-        | _gdk_macos_display_get_current_mouse_modifiers (GDK_MACOS_DISPLAY (display));
+  _gdk_macos_display_from_display_coords (GDK_MACOS_DISPLAY (display),
+                                          point.x, point.y,
+                                          &x_tmp, &y_tmp);

-  *x = point.x;
-  *y = point.y - surface->height;
+  *x = x_tmp;
+  *y = x_tmp;

-  return *x >= 0 && *y >= 0 && *x < surface->width && *y < surface->height;
+  return TRUE;
 }

 static void
@@ -713,10 +713,7 @@ _gdk_macos_surface_thaw (GdkMacosSurface *self,
      timings = gdk_frame_clock_get_timings (frame_clock, self->pending_frame_counter);

      if (timings != NULL)
-        {
-          timings->presentation_time = presentation_time - refresh_interval;
-          timings->complete = TRUE;
-        }
+        timings->presentation_time = presentation_time - refresh_interval;

      self->pending_frame_counter = 0;
    }
@@ -823,6 +820,7 @@ _gdk_macos_surface_synthesize_null_key (GdkMacosSurface *self)
  event = gdk_key_event_new (GDK_KEY_PRESS,
                             GDK_SURFACE (self),
                             gdk_seat_get_keyboard (seat),
+                             NULL,
                             GDK_CURRENT_TIME,
                             0,
                             0,
@@ -25,7 +25,6 @@
 #include "gdktoplevelprivate.h"

 #include "gdkmacosdisplay-private.h"
-#include "gdkmacosmonitor-private.h"
 #include "gdkmacostoplevelsurface-private.h"
 #include "gdkmacosutils-private.h"

@@ -96,7 +95,6 @@ static gboolean
 _gdk_macos_toplevel_surface_present (GdkToplevel       *toplevel,
                                     GdkToplevelLayout *layout)
 {
-  GdkSurface *surface = GDK_SURFACE (toplevel);
  GdkMacosToplevelSurface *self = (GdkMacosToplevelSurface *)toplevel;
  NSWindow *nswindow = _gdk_macos_surface_get_native (GDK_MACOS_SURFACE (self));
  GdkDisplay *display = gdk_surface_get_display (surface);
@@ -192,11 +190,10 @@ _gdk_macos_toplevel_surface_present (GdkToplevel       *toplevel,
          (GDK_MACOS_SURFACE (self)->shadow_left ||
           GDK_MACOS_SURFACE (self)->shadow_top))
        {
+          GdkMonitor *monitor = _gdk_macos_surface_get_best_monitor (GDK_MACOS_SURFACE (self));
          int x = GDK_SURFACE (self)->x;
          int y = GDK_SURFACE (self)->y;

-          monitor = _gdk_macos_surface_get_best_monitor (GDK_MACOS_SURFACE (self));
-
          if (monitor != NULL)
            {
              GdkRectangle visible;
@@ -43,7 +43,6 @@ gdk_macos_frameworks = [
  'Carbon',
  'CoreVideo',
  'CoreServices',
-  'Foundation',
  'OpenGL',
  'QuartzCore',
 ]
@@ -227,7 +227,7 @@ libgdk_c_args = [

 gdk_backends = []
 gdk_backends_gen_headers = []  # non-public generated headers
-foreach backend : ['broadway', 'wayland', 'win32', 'x11', 'macos']
+foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11', 'macos']
  if get_variable('@0@_enabled'.format(backend))
    subdir(backend)
    gdk_deps += get_variable('gdk_@0@_deps'.format(backend))
@@ -3,15 +3,11 @@

 #include "gdkwaylanddevice.h"

-void gdk_wayland_device_query_state (GdkDevice        *device,
-                                     GdkSurface       *surface,
-                                     double           *win_x,
-                                     double           *win_y,
-                                     GdkModifierType  *mask);
-
-void gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
-                                          GdkDevicePadFeature  feature,
-                                          guint                feature_idx,
-                                          const char          *label);
+void
+gdk_wayland_device_query_state (GdkDevice        *device,
+                                GdkSurface       *surface,
+                                double           *win_x,
+                                double           *win_y,
+                                GdkModifierType  *mask);

 #endif
@@ -942,7 +942,7 @@ gdk_wayland_device_pad_init (GdkWaylandDevicePad *pad)
 }

 /**
- * gdk_wayland_device_get_wl_seat: (skip)
+ * gdk_wayland_device_get_wl_seat:
 * @device: (type GdkWaylandDevice): a #GdkDevice
 *
 * Returns the Wayland wl_seat of a #GdkDevice.
@@ -961,7 +961,7 @@ gdk_wayland_device_get_wl_seat (GdkDevice *device)
 }

 /**
- * gdk_wayland_device_get_wl_pointer: (skip)
+ * gdk_wayland_device_get_wl_pointer:
 * @device: (type GdkWaylandDevice): a #GdkDevice
 *
 * Returns the Wayland wl_pointer of a #GdkDevice.
@@ -980,7 +980,7 @@ gdk_wayland_device_get_wl_pointer (GdkDevice *device)
 }

 /**
- * gdk_wayland_device_get_wl_keyboard: (skip)
+ * gdk_wayland_device_get_wl_keyboard:
 * @device: (type GdkWaylandDevice): a #GdkDevice
 *
 * Returns the Wayland wl_keyboard of a #GdkDevice.
@@ -4971,12 +4971,6 @@ gdk_wayland_seat_set_drag (GdkSeat *seat,
  g_set_object (&wayland_seat->drag, drag);
 }

-/**
- * gdk_wayland_device_get_data_device: (skip)
- * @gdk_device: (type GdkWaylandDevice): a #GdkDevice
- *
- * ...
- */
 struct wl_data_device *
 gdk_wayland_device_get_data_device (GdkDevice *gdk_device)
 {
@@ -4988,13 +4982,6 @@ gdk_wayland_device_get_data_device (GdkDevice *gdk_device)
  return seat->data_device;
 }

-/**
- * gdk_wayland_device_set_selection: (skip)
- * @gdk_device: (type GdkWaylandDevice): a #GdkDevice
- * @source: the data source for the selection
- *
- * ...
- */
 void
 gdk_wayland_device_set_selection (GdkDevice             *gdk_device,
                                  struct wl_data_source *source)
@@ -5012,12 +4999,12 @@ gdk_wayland_device_set_selection (GdkDevice             *gdk_device,
 }

 /**
- * gdk_wayland_seat_get_wl_seat: (skip)
+ * gdk_wayland_seat_get_wl_seat:
 * @seat: (type GdkWaylandSeat): a #GdkSeat
 *
- * Returns the Wayland `wl_seat` of a #GdkSeat.
+ * Returns the Wayland wl_seat of a #GdkSeat.
 *
- * Returns: (transfer none): a Wayland `wl_seat`
+ * Returns: (transfer none): a Wayland wl_seat
 */
 struct wl_seat *
 gdk_wayland_seat_get_wl_seat (GdkSeat *seat)
@@ -5029,10 +5016,9 @@ gdk_wayland_seat_get_wl_seat (GdkSeat *seat)

 /**
 * gdk_wayland_device_get_node_path:
- * @device: (type GdkWaylandDevice): a #GdkDevice
- *
- * Returns the `/dev/input/event*` path of this device.
+ * @device: a #GdkDevice
 *
+ * Returns the /dev/input/event* path of this device.
 * For #GdkDevices that possibly coalesce multiple hardware
 * devices (eg. mouse, keyboard, touch,...), this function
 * will return %NULL.
@@ -5040,8 +5026,8 @@ gdk_wayland_seat_get_wl_seat (GdkSeat *seat)
 * This is most notably implemented for devices of type
 * %GDK_SOURCE_PEN, %GDK_SOURCE_TABLET_PAD.
 *
- * Returns: (nullable) (transfer none): the `/dev/input/event*` path of this device
- */
+ * Returns: the /dev/input/event* path of this device
+ **/
 const char *
 gdk_wayland_device_get_node_path (GdkDevice *device)
 {
@@ -5064,9 +5050,9 @@ gdk_wayland_device_get_node_path (GdkDevice *device)
  return NULL;
 }

-/*<private>
+/**
 * gdk_wayland_device_pad_set_feedback:
- * @device: (type GdkWaylandDevice): a %GDK_SOURCE_TABLET_PAD device
+ * @device: a %GDK_SOURCE_TABLET_PAD device
 * @feature: Feature to set the feedback label for
 * @feature_idx: 0-indexed index of the feature to set the feedback label for
 * @label: Feedback label
@@ -384,15 +384,6 @@ static const struct org_kde_kwin_server_decoration_manager_listener server_decor
  .default_mode = server_decoration_manager_default_mode
 };

-/*
- * gdk_wayland_display_prefers_ssd:
- * @display: (type GdkWaylandDisplay): a #GdkDisplay
- *
- * Checks whether the Wayland compositor prefers to draw the window
- * decorations or if it leaves decorations to the application.
- *
- * Returns: %TRUE if the compositor prefers server-side decorations
- */
 gboolean
 gdk_wayland_display_prefers_ssd (GdkDisplay *display)
 {
@@ -868,12 +859,12 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)

 /**
 * gdk_wayland_display_get_startup_notification_id:
- * @display: (type GdkWaylandDisplay): a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
 *
 * Gets the startup notification ID for a Wayland display, or %NULL
 * if no ID has been defined.
 *
- * Returns: (nullable): the startup notification ID for @display, or %NULL
+ * Returns: the startup notification ID for @display, or %NULL
 */
 const char *
 gdk_wayland_display_get_startup_notification_id (GdkDisplay  *display)
@@ -1073,16 +1064,10 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
  return wl_cursor_theme_create ("/usr/share/icons/default/cursors", size, display_wayland->shm);
 }

-/**
- * gdk_wayland_display_set_cursor_theme:
- * @display: (type GdkWaylandDisplay): a #GdkDisplay
- *
- * Sets the cursor theme for the given @display.
- */
 void
-gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
+gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
                                      const char *name,
-                                      int         size)
+                                      int          size)
 {
  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY(display);
  struct wl_cursor_theme *theme;
@@ -1169,7 +1154,7 @@ _gdk_wayland_display_update_serial (GdkWaylandDisplay *display_wayland,
 }

 /**
- * gdk_wayland_display_get_wl_display: (skip)
+ * gdk_wayland_display_get_wl_display:
 * @display: (type GdkWaylandDisplay): a #GdkDisplay
 *
 * Returns the Wayland wl_display of a #GdkDisplay.
@@ -1185,7 +1170,7 @@ gdk_wayland_display_get_wl_display (GdkDisplay *display)
 }

 /**
- * gdk_wayland_display_get_wl_compositor: (skip)
+ * gdk_wayland_display_get_wl_compositor:
 * @display: (type GdkWaylandDisplay): a #GdkDisplay
 *
 * Returns the Wayland global singleton compositor of a #GdkDisplay.
@@ -2632,11 +2617,11 @@ gdk_wayland_display_get_output_scale (GdkWaylandDisplay *display_wayland,

 /**
 * gdk_wayland_display_query_registry:
- * @display: (type GdkWaylandDisplay): a #GdkDisplay
+ * @display: a wayland #GdkDisplay
 * @global: global interface to query in the registry
 *
 * Returns %TRUE if the the interface was found in the display
- * `wl_registry.global` handler.
+ * wl_registry.global handler.
 *
 * Returns: %TRUE if the global is offered by the compositor
 **/
@@ -165,8 +165,6 @@ struct _GdkWaylandDisplayClass
  GdkDisplayClass parent_class;
 };

-gboolean                gdk_wayland_display_prefers_ssd         (GdkDisplay *display);
-
 G_END_DECLS

 #endif  /* __GDK_WAYLAND_DISPLAY__ */
@@ -49,7 +49,7 @@ gdk_wayland_monitor_class_init (GdkWaylandMonitorClass *class)
 }

 /**
- * gdk_wayland_monitor_get_wl_output: (skip)
+ * gdk_wayland_monitor_get_wl_output:
 * @monitor: (type GdkWaylandMonitor): a #GdkMonitor
 *
 * Returns the Wayland wl_output of a #GdkMonitor.
@@ -22,18 +22,25 @@

 #include "config.h"

-#include "gdkwaylandseat.h"
-#include "gdk/gdkseatprivate.h"
+#include <gdk/gdkseatprivate.h>

+#define GDK_TYPE_WAYLAND_SEAT         (gdk_wayland_seat_get_type ())
+#define GDK_WAYLAND_SEAT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeat))
 #define GDK_WAYLAND_SEAT_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeatClass))
+#define GDK_IS_WAYLAND_SEAT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_WAYLAND_SEAT))
 #define GDK_IS_WAYLAND_SEAT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_WAYLAND_SEAT))
 #define GDK_WAYLAND_SEAT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeatClass))

+typedef struct _GdkWaylandSeat GdkWaylandSeat;
+typedef struct _GdkWaylandSeatClass GdkWaylandSeatClass;
+
 struct _GdkWaylandSeatClass
 {
  GdkSeatClass parent_class;
 };

+GType gdk_wayland_seat_get_type (void) G_GNUC_CONST;
+
 void gdk_wayland_seat_update_cursor_scale (GdkWaylandSeat *seat);

 void gdk_wayland_seat_clear_touchpoints (GdkWaylandSeat *seat,
@@ -17,7 +17,12 @@

 #include "config.h"

-#include "gdksurface-wayland.h"
+#include <netinet/in.h>
+#include <unistd.h>
+
+#include "gdk.h"
+#include "gdkwayland.h"
+#include "gdkwaylandsurface.h"

 #include "gdkdeviceprivate.h"
 #include "gdkdisplay-wayland.h"
@@ -40,9 +45,6 @@
 #include <string.h>
 #include <errno.h>

-#include <netinet/in.h>
-#include <unistd.h>
-
 #define SURFACE_IS_TOPLEVEL(surface)  TRUE

 #define MAX_WL_BUFFER_SIZE (4083) /* 4096 minus header, string argument length and NUL byte */
@@ -331,9 +333,7 @@ _gdk_wayland_surface_save_size (GdkSurface *surface)
 {
  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);

-  if (surface->state & (GDK_TOPLEVEL_STATE_FULLSCREEN |
-                        GDK_TOPLEVEL_STATE_MAXIMIZED |
-                        GDK_TOPLEVEL_STATE_TILED))
+  if (surface->state & (GDK_TOPLEVEL_STATE_FULLSCREEN | GDK_TOPLEVEL_STATE_MAXIMIZED))
    return;

  impl->saved_width = surface->width - impl->margin_left - impl->margin_right;
@@ -881,6 +881,24 @@ gdk_wayland_surface_finalize (GObject *object)
  G_OBJECT_CLASS (gdk_wayland_surface_parent_class)->finalize (object);
 }

+static void
+gdk_wayland_surface_resize (GdkSurface *surface,
+                            int         width,
+                            int         height,
+                            int         scale)
+{
+  GdkDisplay *display;
+  GdkEvent *event;
+
+  event = gdk_configure_event_new (surface, width, height);
+
+  gdk_wayland_surface_update_size (surface, width, height, scale);
+  _gdk_surface_update_size (surface);
+
+  display = gdk_surface_get_display (surface);
+  _gdk_wayland_display_deliver_event (display, event);
+}
+
 static gboolean
 is_realized_shell_surface (GdkWaylandSurface *impl)
 {
@@ -902,26 +920,6 @@ is_realized_popup (GdkWaylandSurface *impl)
          impl->display_server.zxdg_popup_v6);
 }

-static void
-gdk_wayland_surface_resize (GdkSurface *surface,
-                            int         width,
-                            int         height,
-                            int         scale)
-{
-  gdk_wayland_surface_update_size (surface, width, height, scale);
-  _gdk_surface_update_size (surface);
-
-  if (is_realized_shell_surface (GDK_WAYLAND_SURFACE (surface)))
-    {
-      GdkDisplay *display;
-      GdkEvent *event;
-
-      event = gdk_configure_event_new (surface, width, height);
-      display = gdk_surface_get_display (surface);
-      _gdk_wayland_display_deliver_event (display, event);
-    }
-}
-
 static void gdk_wayland_surface_show (GdkSurface *surface,
                                      gboolean    already_mapped);
 static void gdk_wayland_surface_hide (GdkSurface *surface);
@@ -1352,11 +1350,6 @@ gdk_wayland_surface_configure_toplevel (GdkSurface *surface)
          /* Save size for next time we get 0x0 */
          _gdk_wayland_surface_save_size (surface);
        }
-      else
-        {
-          width += impl->margin_left + impl->margin_right;
-          height += impl->margin_top + impl->margin_bottom;
-        }

      gdk_wayland_surface_resize (surface, width, height, impl->scale);
    }
@@ -1692,13 +1685,6 @@ create_zxdg_toplevel_v6_resources (GdkSurface *surface)
                                 surface);
 }

-/**
- * gdk_wayland_toplevel_set_application_id:
- * @toplevel: (type GdkWaylandToplevel): a #GdkToplevel
- * @application_id: the application id for the @toplevel
- *
- * Sets the application id on a #GdkToplevel.
- */
 void
 gdk_wayland_toplevel_set_application_id (GdkToplevel *toplevel,
                                         const char  *application_id)
@@ -2797,8 +2783,6 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
      g_clear_pointer (&impl->popup.layout, gdk_popup_layout_unref);
    }

-  impl->has_uncommitted_ack_configure = FALSE;
-
  unset_transient_for_exported (surface);

  _gdk_wayland_surface_clear_saved_size (surface);
@@ -4040,7 +4024,7 @@ _gdk_wayland_surface_set_grab_seat (GdkSurface *surface,
 }

 /**
- * gdk_wayland_surface_get_wl_surface: (skip)
+ * gdk_wayland_surface_get_wl_surface:
 * @surface: (type GdkWaylandSurface): a #GdkSurface
 *
 * Returns the Wayland surface of a #GdkSurface.
@@ -4170,13 +4154,13 @@ maybe_set_gtk_surface_dbus_properties (GdkWaylandSurface *impl)
 }

 void
-gdk_wayland_toplevel_set_dbus_properties (GdkToplevel *toplevel,
-                                          const char  *application_id,
-                                          const char  *app_menu_path,
-                                          const char  *menubar_path,
-                                          const char  *window_object_path,
-                                          const char  *application_object_path,
-                                          const char *unique_bus_name)
+gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel,
+                                                      const char  *application_id,
+                                                      const char  *app_menu_path,
+                                                      const char  *menubar_path,
+                                                      const char  *window_object_path,
+                                                      const char  *application_object_path,
+                                                      const char *unique_bus_name)
 {
  GdkWaylandSurface *impl;

@@ -4232,12 +4216,12 @@ static const struct zxdg_exported_v1_listener xdg_exported_listener = {

 /**
 * GdkWaylandToplevelExported:
- * @toplevel: (type GdkWaylandToplevel): the #GdkToplevel that is exported
+ * @toplevel: the #GdkToplevel that is exported
 * @handle: the handle
 * @user_data: user data that was passed to gdk_wayland_toplevel_export_handle()
 *
 * Callback that gets called when the handle for a surface has been
- * obtained from the Wayland compositor. The @handle can be passed
+ * obtained from the Wayland compositor. The handle can be passed
 * to other processes, for the purpose of marking surfaces as transient
 * for out-of-process surfaces.
 */
@@ -4250,7 +4234,7 @@ gdk_wayland_surface_is_exported (GdkWaylandSurface *impl)

 /**
 * gdk_wayland_toplevel_export_handle:
- * @toplevel: (type GdkWaylandToplevel): the #GdkToplevel to obtain a handle for
+ * @toplevel: the #GdkToplevel to obtain a handle for
 * @callback: callback to call with the handle
 * @user_data: (closure): user data for @callback
 * @destroy_func: destroy notify for @user_data
@@ -4314,7 +4298,7 @@ gdk_wayland_toplevel_export_handle (GdkToplevel                *toplevel,

 /**
 * gdk_wayland_toplevel_unexport_handle:
- * @toplevel: (type GdkWaylandToplevel): the #GdkToplevel to unexport
+ * @toplevel: the #GdkToplevel to unexport
 *
 * Destroys the handle that was obtained with
 * gdk_wayland_toplevel_export_handle().
@@ -4368,7 +4352,7 @@ static const struct zxdg_imported_v1_listener xdg_imported_listener = {

 /**
 * gdk_wayland_toplevel_set_transient_for_exported:
- * @toplevel: (type GdkWaylandToplevel): the #GdkToplevel to make as transient
+ * @toplevel: the #GdkToplevel to make as transient
 * @parent_handle_str: an exported handle for a surface
 *
 * Marks @toplevel as transient for the surface to which the given
@@ -4421,13 +4405,6 @@ gdk_wayland_surface_get_inhibitor (GdkWaylandSurface *impl,
  return g_hash_table_lookup (impl->shortcuts_inhibitors, gdk_seat);
 }

-/*
- * gdk_wayland_surface_inhibit_shortcuts:
- * @surface: (type GdkWaylandSurface): a #GdkSurface
- * @seat: the seat to inhibit
- *
- * Inhibits the shortcuts coming from the given @seat.
- */
 void
 gdk_wayland_surface_inhibit_shortcuts (GdkSurface *surface,
                                       GdkSeat    *gdk_seat)
@@ -4451,14 +4428,6 @@ gdk_wayland_surface_inhibit_shortcuts (GdkSurface *surface,
  g_hash_table_insert (impl->shortcuts_inhibitors, gdk_seat, inhibitor);
 }

-/*
- * gdk_wayland_surface_restore_shortcuts:
- * @surface: (type GdkWaylandSurface): a #GdkSurface
- * @seat: the seat to inhibit
- *
- * Restores the shortcuts on the given @seat inhibited by calling
- * gdk_wayland_surface_inhibit_shortcuts().
- */
 void
 gdk_wayland_surface_restore_shortcuts (GdkSurface *surface,
                                       GdkSeat    *gdk_seat)
@@ -4479,10 +4448,8 @@ create_dnd_surface (GdkDisplay *display)
 {
  GdkSurface *surface;

-  surface = _gdk_wayland_display_create_surface (display,
-                                                 GDK_SURFACE_TEMP,
-                                                 NULL,
-                                                 0, 0, 100, 100);
+  surface = gdk_surface_new_temp (display, &(GdkRectangle){ 0, 0, 100, 100 });
+
  GDK_WAYLAND_SURFACE (surface)->is_drag_surface = TRUE;

  return surface;
@@ -1,40 +0,0 @@
-/* gdksurface-wayland.h: Private header for GdkWaylandSurface
- *
- * Copyright 2020  GNOME Foundation
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "gdkwaylandsurface.h"
-
-G_BEGIN_DECLS
-
-void                     gdk_wayland_toplevel_set_dbus_properties       (GdkToplevel *toplevel,
-                                                                         const char  *application_id,
-                                                                         const char  *app_menu_path,
-                                                                         const char  *menubar_path,
-                                                                         const char  *window_object_path,
-                                                                         const char  *application_object_path,
-                                                                         const char  *unique_bus_name);
-
-void                     gdk_wayland_toplevel_announce_csd              (GdkToplevel *toplevel);
-
-gboolean                 gdk_wayland_toplevel_inhibit_idle              (GdkToplevel *toplevel);
-void                     gdk_wayland_toplevel_uninhibit_idle            (GdkToplevel *toplevel);
-
-G_END_DECLS
@@ -32,7 +32,6 @@
 #include <gdk/wayland/gdkwaylanddevice.h>
 #include <gdk/wayland/gdkwaylanddisplay.h>
 #include <gdk/wayland/gdkwaylandmonitor.h>
-#include <gdk/wayland/gdkwaylandseat.h>
 #include <gdk/wayland/gdkwaylandsurface.h>
 #include <gdk/wayland/gdkwaylandglcontext.h>

@@ -33,7 +33,6 @@ typedef struct _GdkWaylandDevice GdkWaylandDevice;
 #else
 typedef GdkDevice GdkWaylandDevice;
 #endif
-
 typedef struct _GdkWaylandDeviceClass GdkWaylandDeviceClass;

 #define GDK_TYPE_WAYLAND_DEVICE         (gdk_wayland_device_get_type ())
@@ -53,9 +52,18 @@ struct wl_pointer   *gdk_wayland_device_get_wl_pointer      (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL
 struct wl_keyboard  *gdk_wayland_device_get_wl_keyboard     (GdkDevice *device);

+GDK_AVAILABLE_IN_ALL
+struct wl_seat      *gdk_wayland_seat_get_wl_seat           (GdkSeat   *seat);
+
 GDK_AVAILABLE_IN_ALL
 const char          *gdk_wayland_device_get_node_path       (GdkDevice *device);

+GDK_AVAILABLE_IN_ALL
+void                 gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
+                                                          GdkDevicePadFeature  element,
+                                                          guint                idx,
+                                                          const char          *label);
+
 G_END_DECLS

 #endif /* __GDK_WAYLAND_DEVICE_H__ */
@@ -59,6 +59,8 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_startup_notification_id (GdkDisplay *display,
                                                                         const char *startup_id);

+gboolean                gdk_wayland_display_prefers_ssd         (GdkDisplay *display);
+
 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_wayland_display_query_registry      (GdkDisplay  *display,
 								 const char *global);
@@ -1,49 +0,0 @@
-/* gdkwaylandseat.h: Wayland GdkSeat
- *
- * Copyright 2020  GNOME Foundation
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
-#endif
-
-#include <gdk/gdk.h>
-#include <wayland-client.h>
-
-G_BEGIN_DECLS
-
-#ifdef GTK_COMPILATION
-typedef struct _GdkWaylandSeat GdkWaylandSeat;
-#else
-typedef GdkSeat GdkWaylandSeat;
-#endif
-
-typedef struct _GdkWaylandSeatClass GdkWaylandSeatClass;
-
-#define GDK_TYPE_WAYLAND_SEAT         (gdk_wayland_seat_get_type ())
-#define GDK_WAYLAND_SEAT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeat))
-#define GDK_IS_WAYLAND_SEAT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_WAYLAND_SEAT))
-
-GDK_AVAILABLE_IN_ALL
-GType gdk_wayland_seat_get_type (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_ALL
-struct wl_seat *        gdk_wayland_seat_get_wl_seat    (GdkSeat *seat);
-
-G_END_DECLS
@@ -62,6 +62,15 @@ GType                    gdk_wayland_popup_get_type               (void);
 GDK_AVAILABLE_IN_ALL
 struct wl_surface       *gdk_wayland_surface_get_wl_surface       (GdkSurface *surface);

+GDK_AVAILABLE_IN_ALL
+void                     gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel,
+                                                                               const char  *application_id,
+                                                                               const char  *app_menu_path,
+                                                                               const char  *menubar_path,
+                                                                               const char  *window_object_path,
+                                                                               const char  *application_object_path,
+                                                                               const char  *unique_bus_name);
+
 typedef void (*GdkWaylandToplevelExported) (GdkToplevel *toplevel,
                                            const char  *handle,
                                            gpointer     user_data);
@@ -83,6 +92,11 @@ GDK_AVAILABLE_IN_ALL
 void                     gdk_wayland_toplevel_set_application_id (GdkToplevel *toplevel,
                                                                  const char  *application_id);

+void                     gdk_wayland_toplevel_announce_csd       (GdkToplevel *toplevel);
+
+gboolean                 gdk_wayland_toplevel_inhibit_idle       (GdkToplevel *toplevel);
+void                     gdk_wayland_toplevel_uninhibit_idle     (GdkToplevel *toplevel);
+
 G_END_DECLS

 #endif /* __GDK_WAYLAND_SURFACE_H__ */
@@ -24,8 +24,7 @@ gdk_wayland_public_headers = files([
  'gdkwaylanddisplay.h',
  'gdkwaylandglcontext.h',
  'gdkwaylandmonitor.h',
-  'gdkwaylandseat.h',
-  'gdkwaylandsurface.h',
+  'gdkwaylandsurface.h'
 ])

 install_headers(gdk_wayland_public_headers, 'gdkwayland.h', subdir: 'gtk-4.0/gdk/wayland/')
@@ -427,12 +427,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
 			    ndevices, ncursors));
 #endif
  /* Create a dummy window to receive wintab events */
-  wintab_window =
-      _gdk_win32_display_create_surface (display,
-                                         GDK_SURFACE_TEMP,
-                                         NULL,
-                                         -100, -100, 2, 2);
-
+  wintab_window = gdk_surface_new_temp (display, &(GdkRectangle) { -100, -100, 2, 2 });
  g_object_ref (wintab_window);

  for (devix = 0; devix < ndevices; devix++)
@@ -1700,10 +1700,7 @@ create_drag_surface (GdkDisplay *display)
 {
  GdkSurface *surface;

-  surface = _gdk_win32_display_create_surface (display,
-                                               GDK_SURFACE_TEMP,
-                                               NULL,
-                                               0, 0, 100, 100);
+  surface = gdk_surface_new_temp (display, &(GdkRectangle) { 0, 0, 100, 100 });

  return surface;
 }
@@ -1578,6 +1578,225 @@ generate_button_event (GdkEventType      type,
  _gdk_win32_append_event (event);
 }

+/*
+ * Used by the stacking functions to see if a window
+ * should be always on top.
+ * Restacking is only done if both windows are either ontop
+ * or not ontop.
+ */
+static gboolean
+should_window_be_always_on_top (GdkSurface *window)
+{
+  DWORD exstyle;
+
+  if (GDK_IS_DRAG_SURFACE (window) ||
+      (window->state & GDK_TOPLEVEL_STATE_ABOVE))
+    return TRUE;
+
+  exstyle = GetWindowLong (GDK_SURFACE_HWND (window), GWL_EXSTYLE);
+
+  if (exstyle & WS_EX_TOPMOST)
+    return TRUE;
+
+  return FALSE;
+}
+
+static void
+restack_children (GdkSurface *window)
+{
+  GList *popup;
+
+  for (popup = window->children; popup; popup = popup->next)
+    {
+      GdkSurface *child = GDK_SURFACE (popup->data);
+      /* Windows doesn't have a function to put window A *above* window B.
+       * Instead we put window A immediately *below* window B,
+       * then put window B immediately below window A.
+       * SWP_NOSENDCHANGING prevents our own handler from triggering.
+       */
+      SetWindowPos (GDK_SURFACE_HWND (child), GDK_SURFACE_HWND (window), 0, 0, 0, 0,
+                    SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING);
+      g_print ("Put popup %p (%p) above %p (%p)\n", child, GDK_SURFACE_HWND (child), window, GDK_SURFACE_HWND (window));
+      SetWindowPos (GDK_SURFACE_HWND (window), GDK_SURFACE_HWND (child), 0, 0, 0, 0,
+                    SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER);
+    }
+}
+
+static void
+ensure_stacking_on_unminimize (MSG *msg)
+{
+  HWND rover;
+  HWND lowest_transient = NULL;
+  GdkSurface *msg_window;
+  gboolean window_ontop = FALSE;
+
+  msg_window = gdk_win32_handle_table_lookup (msg->hwnd);
+
+  if (msg_window)
+    window_ontop = should_window_be_always_on_top (msg_window);
+
+  for (rover = GetNextWindow (msg->hwnd, GW_HWNDNEXT);
+       rover;
+       rover = GetNextWindow (rover, GW_HWNDNEXT))
+    {
+      GdkSurface *rover_gdkw = gdk_win32_handle_table_lookup (rover);
+      GdkWin32Surface *rover_impl;
+      gboolean rover_ontop;
+
+      /* Checking window group not implemented yet */
+      if (rover_gdkw == NULL)
+        continue;
+
+      rover_ontop = should_window_be_always_on_top (rover_gdkw);
+      rover_impl = GDK_WIN32_SURFACE (rover_gdkw);
+
+      if (GDK_SURFACE_IS_MAPPED (rover_gdkw) &&
+           rover_impl->transient_owner != NULL &&
+           ((window_ontop && rover_ontop) || (!window_ontop && !rover_ontop)))
+        {
+          lowest_transient = rover;
+        }
+    }
+
+  if (lowest_transient != NULL)
+    {
+      GDK_NOTE (EVENTS,
+		g_print (" restacking %p below %p",
+			 msg->hwnd, lowest_transient));
+      SetWindowPos (msg->hwnd, lowest_transient, 0, 0, 0, 0,
+		    SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER);
+    }
+}
+
+static gboolean
+ensure_stacking_on_window_pos_changing (MSG       *msg,
+					GdkSurface *window)
+{
+  GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
+  WINDOWPOS *windowpos = (WINDOWPOS *) msg->lParam;
+  HWND rover;
+  gboolean restacking;
+  gboolean window_ontop;
+
+  if (GetActiveWindow () != msg->hwnd ||
+      impl->transient_owner != NULL)
+    return FALSE;
+
+  /* Make sure the window stays behind any transient-type windows
+   * of the same window group.
+   *
+   * If the window is not active and being activated, we let
+   * Windows bring it to the top and rely on the WM_ACTIVATEAPP
+   * handling to bring any utility windows on top of it.
+   */
+
+  window_ontop = should_window_be_always_on_top (window);
+
+  for (rover = windowpos->hwndInsertAfter, restacking = FALSE;
+       rover;
+       rover = GetNextWindow (rover, GW_HWNDNEXT))
+    {
+      GdkSurface *rover_gdkw = gdk_win32_handle_table_lookup (rover);
+      GdkWin32Surface *rover_impl;
+      gboolean rover_ontop;
+
+      /* Checking window group not implemented yet */
+
+      if (rover_gdkw == NULL)
+	continue;
+
+      rover_ontop = should_window_be_always_on_top (rover_gdkw);
+      rover_impl = GDK_WIN32_SURFACE (rover_gdkw);
+
+      if (GDK_SURFACE_IS_MAPPED (rover_gdkw) &&
+           rover_impl->transient_owner != NULL &&
+          ((window_ontop && rover_ontop) || (!window_ontop && !rover_ontop)))
+        {
+          restacking = TRUE;
+          windowpos->hwndInsertAfter = rover;
+        }
+    }
+
+  if (restacking)
+    {
+      GDK_NOTE (EVENTS,
+		g_print (" letting Windows restack %p above %p",
+			 msg->hwnd, windowpos->hwndInsertAfter));
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+ensure_stacking_on_activate_app (MSG       *msg,
+				 GdkSurface *window)
+{
+  GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
+  HWND rover;
+  gboolean window_ontop;
+
+  if (impl->transient_owner != NULL)
+    {
+      GdkSurface *child = window;
+      GdkSurface *owner = impl->transient_owner;
+
+      SetWindowPos (msg->hwnd, HWND_TOP, 0, 0, 0, 0,
+		    SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER);
+      /* Bing the whole hierarchy of transients back up */
+      while (owner != NULL)
+        {
+          SetWindowPos (GDK_SURFACE_HWND (owner), GDK_SURFACE_HWND (child), 0, 0, 0, 0,
+                        SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER);
+          restack_children (owner);
+          child = owner;
+          owner = GDK_WIN32_SURFACE (owner)->transient_owner;
+        }
+      return;
+    }
+
+  if (!IsWindowVisible (msg->hwnd) ||
+      msg->hwnd != GetActiveWindow ())
+    return;
+
+
+  /* This window is not a transient-type window and it is the
+   * activated window. Make sure this window is as visible as
+   * possible, just below the lowest transient-type window of this
+   * app.
+   */
+
+  window_ontop = should_window_be_always_on_top (window);
+
+  for (rover = GetNextWindow (msg->hwnd, GW_HWNDPREV);
+       rover;
+       rover = GetNextWindow (rover, GW_HWNDPREV))
+    {
+      GdkSurface *rover_gdkw = gdk_win32_handle_table_lookup (rover);
+      GdkWin32Surface *rover_impl;
+      gboolean rover_ontop;
+
+      /* Checking window group not implemented yet */
+      if (rover_gdkw == NULL)
+        continue;
+
+      rover_ontop = should_window_be_always_on_top (rover_gdkw);
+      rover_impl = GDK_WIN32_SURFACE (rover_gdkw);
+
+      if (GDK_SURFACE_IS_MAPPED (rover_gdkw) &&
+          rover_impl->transient_owner != NULL &&
+          ((window_ontop && rover_ontop) || (!window_ontop && !rover_ontop)))
+        {
+	  GDK_NOTE (EVENTS,
+		    g_print (" restacking %p below %p",
+			     msg->hwnd, rover));
+	  SetWindowPos (msg->hwnd, rover, 0, 0, 0, 0,
+			SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER);
+          break;
+	}
+    }
+}
+
 static gboolean
 handle_wm_sysmenu (GdkSurface *window, MSG *msg, int *ret_valp)
 {
@@ -2802,6 +3021,7 @@ gdk_event_translate (MSG *msg,

      if (GDK_SURFACE_IS_MAPPED (window))
        {
+	  return_val = ensure_stacking_on_window_pos_changing (msg, window);

          impl = GDK_WIN32_SURFACE (window);

@@ -2881,6 +3101,17 @@ gdk_event_translate (MSG *msg,
 	  if ((old_state & GDK_TOPLEVEL_STATE_MINIMIZED) !=
 	      (new_state & GDK_TOPLEVEL_STATE_MINIMIZED))
 	    do_show_window (window, (new_state & GDK_TOPLEVEL_STATE_MINIMIZED));
+
+
+	  /* When un-minimizing, make sure we're stacked under any
+	     transient-type windows. */
+	  if (!(old_state & GDK_TOPLEVEL_STATE_MINIMIZED) &&
+	      (new_state & GDK_TOPLEVEL_STATE_MINIMIZED))
+            {
+	      ensure_stacking_on_unminimize (msg);
+	      restack_children (window);
+
+	    }
 	}

      /* Show, New size or position => configure event */
@@ -2901,10 +3132,7 @@ gdk_event_translate (MSG *msg,

 	  if (impl->transient_owner &&
 	      GetForegroundWindow () == GDK_SURFACE_HWND (window))
-	    {
-	      SetForegroundWindow (GDK_SURFACE_HWND (impl->transient_owner));
-	      SetCapture (GDK_SURFACE_HWND (impl->transient_owner));
-	    }
+	    SetForegroundWindow (GDK_SURFACE_HWND (impl->transient_owner));
 	}

      if (!(windowpos->flags & SWP_NOCLIENTSIZE))
@@ -3086,6 +3314,11 @@ gdk_event_translate (MSG *msg,
      GDK_NOTE (EVENTS, g_print (" %s thread: %" G_GINT64_FORMAT,
 				 msg->wParam ? "YES" : "NO",
 				 (gint64) msg->lParam));
+      if (msg->wParam && GDK_SURFACE_IS_MAPPED (window))
+	{
+	  ensure_stacking_on_activate_app (msg, window);
+	  restack_children (window);
+	}
      break;
    case WM_NCHITTEST:
      /* TODO: pass all messages to DwmDefWindowProc() first! */
@@ -1001,7 +1001,7 @@ show_window_internal (GdkSurface *window,
      API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window),
 			       (window->state & GDK_TOPLEVEL_STATE_ABOVE)?HWND_TOPMOST:HWND_NOTOPMOST,
 			       0, 0, 0, 0,
-			       SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE));
+			       SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER));
    }
 }

@@ -1327,9 +1327,6 @@ gdk_win32_surface_raise (GdkSurface *window)
        API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), HWND_TOPMOST,
 	                         0, 0, 0, 0,
 				 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER));
-         
-      else if (GDK_IS_POPUP (window))
-        ShowWindow (GDK_SURFACE_HWND (window), SW_SHOWNOACTIVATE);
      else
        /* Do not wrap this in an API_CALL macro as SetForegroundWindow might
         * fail when for example dragging a window belonging to a different
@@ -1927,7 +1924,7 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window)
  rect.right += after.right - before.right;
  rect.bottom += after.bottom - before.bottom;

-  flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION;
+  flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOOWNERZORDER;

  if (will_be_topmost && !was_topmost)
    {
@@ -4260,7 +4257,7 @@ gdk_win32_surface_fullscreen (GdkSurface *window)

      API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), HWND_TOP,
                x, y, width, height,
-                SWP_NOCOPYBITS | SWP_SHOWWINDOW));
+                SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER));
    }
 }

@@ -4284,7 +4281,7 @@ gdk_win32_surface_unfullscreen (GdkSurface *window)
      API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), HWND_NOTOPMOST,
 			       fi->r.left, fi->r.top,
 			       fi->r.right - fi->r.left, fi->r.bottom - fi->r.top,
-			       SWP_NOCOPYBITS | SWP_SHOWWINDOW));
+			       SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER));

      g_object_set_data (G_OBJECT (window), "fullscreen-info", NULL);
      g_free (fi);
@@ -4825,15 +4822,7 @@ gdk_win32_toplevel_set_property (GObject      *object,
      break;

    case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
-      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);
-        }
-
-      g_object_notify_by_pspec (G_OBJECT (surface), pspec);
+      _gdk_push_modal_window (surface);
      break;

    case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
@@ -4887,7 +4876,6 @@ gdk_win32_toplevel_get_property (GObject    *object,
      break;

    case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
-      g_value_set_boolean (value, GDK_SURFACE (surface)->modal_hint);
      break;

    case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
@@ -1441,11 +1441,10 @@ gdk_x11_display_open (const char *display_name)

  gdk_event_init (display);

-  display_x11->leader_gdk_surface =
-      _gdk_x11_display_create_surface (display,
-                                       GDK_SURFACE_TEMP,
-                                       NULL,
-                                       -100, -100, 1, 1);
+  {
+    GdkRectangle rect = { -100, -100, 1, 1 };
+    display_x11->leader_gdk_surface = gdk_surface_new_temp (display, &rect);
+  }

  (_gdk_x11_surface_get_toplevel (display_x11->leader_gdk_surface))->is_leader = TRUE;

@@ -1269,10 +1269,7 @@ create_drag_surface (GdkDisplay *display)
 {
  GdkSurface *surface;

-  surface = _gdk_x11_display_create_surface (display,
-                                             GDK_SURFACE_TEMP,
-                                             NULL,
-                                             0, 0, 100, 100);
+  surface = gdk_surface_new_temp (display, &(GdkRectangle) { 0, 0, 100, 100 });

  return surface;
 }
@@ -2002,10 +1999,7 @@ _gdk_x11_surface_drag_begin (GdkSurface         *surface,

  display = gdk_surface_get_display (surface);

-  ipc_surface = _gdk_x11_display_create_surface (display,
-                                                 GDK_SURFACE_TEMP,
-                                                 NULL,
-                                                 -99, -99, 1, 1);
+  ipc_surface = gdk_surface_new_temp (display, &(GdkRectangle) { -99, -99, 1, 1 });

  drag = (GdkDrag *) g_object_new (GDK_TYPE_X11_DRAG,
                                   "surface", ipc_surface,
@@ -4114,15 +4114,11 @@ create_moveresize_surface (MoveResizeData *mv_resize,
                          guint32         timestamp)
 {
  GdkGrabStatus status;
+  GdkRectangle rect = { -100, -100, 1, 1 };

  g_assert (mv_resize->moveresize_emulation_surface == NULL);

-  mv_resize->moveresize_emulation_surface =
-      _gdk_x11_display_create_surface (mv_resize->display,
-                                       GDK_SURFACE_TEMP,
-                                       NULL,
-                                       -100, -100, 1, 1);
-
+  mv_resize->moveresize_emulation_surface = gdk_surface_new_temp (mv_resize->display, &rect);
  gdk_x11_surface_show (mv_resize->moveresize_emulation_surface, FALSE);

  status = gdk_seat_grab (gdk_device_get_seat (mv_resize->device),
--- a/Show More
+++ b/Show More