css: Improve error reporting for variables

Emit errors for all the variables that were being expanded if an error occurs while parsing a property value at compute time. Include the variables that are being expanded in the error message.
css parser: Keep variables for tokenizers
2024-05-09 23:13:53 -04:00 · 2024-05-09 23:13:53 -04:00 · 2024-05-09 23:13:53 -04:00 · 2024-05-09 23:13:53 -04:00 · 2024-05-09 23:13:53 -04:00 · 2024-05-09 23:13:53 -04:00
309 changed files with 5194 additions and 12463 deletions
@@ -459,7 +459,6 @@ reference:
    - mv _build/docs/reference/gdk/gdk4-wayland/ _reference/gdk4-wayland/
    - mv _build/docs/reference/gsk/gsk4/ _reference/gsk4/
    - mv _build/docs/reference/gtk/gtk4/ _reference/gtk4/
-    - mv _build/docs/reference/gtk/*.html _reference/gtk4/
    - mv _build/subprojects/pango/docs/Pango/ _reference/Pango/
    - mv _build/subprojects/pango/docs/PangoCairo/ _reference/PangoCairo/
    - mv _build/subprojects/pango/docs/PangoFc/ _reference/PangoFc/
@@ -1,54 +1,11 @@
-Overview of Changes in 4.15.2, xx-xx-xxxx
-=========================================
-
-* GtkFileChooserWidget:
- - Plug some memory leaks
- - Make Ctrl-Shift-N create a new folder
-
-* CSS:
- - Support color(), oklab(), etc (https://www.w3.org/TR/css-color-4/)
- - Support color-mix() (https://www.w3.org/TR/css-color-5/)
- - Support relative colors (https://www.w3.org/TR/css-color-5/)
-
-* Accessibility:
- - Avoid markup when reading labels
-
-* GSK:
- - Subset fonts when serializing node trees
-
-* Wayland:
- - Use xdg-dialog protocol for attached dialogs
-
-* Windows:
- - Build with UNICODE
-
-* Debugging:
- - Add GTK_DEBUG=css for warning about deprecated css syntax
-
-* Tools:
- - nodeparser: Add an extract command for data urls
-
-* Deprecations:
- - CSS Color functions shade(), lighter(), darker(), alpha(), mix()
-
-* Translation updates:
- Hebrew
-
-
-Overview of Changes in 4.15.1, 21-05-2024
+Overview of Changes in 4.15.1, xx-xx-xxxx
 =========================================

 * GtkGraphicsOffload:
 - Don't crash without a child

-* GtkSpinner:
- - Don't animate when unmapped
-
 * CSS:
 - Support the :root selector
- - Support variables and custom properties (https://www.w3.org/TR/css-variables-1/)
- - Implement math functions (https://www.w3.org/TR/css-values-4/)
- - Support modern syntax and calc in rgb() and hsl()

 * Icontheme:
 - Make symbolic svg loading more efficient
@@ -57,22 +14,19 @@ Overview of Changes in 4.15.1, 21-05-2024
 * Accessibility:
 - Make the gtk-demo sidebar search more accessible
 - Stop emitting focus events
- - Realize child contexts when necessary

 * GDK:
 - Support XDG_ACTIVATION_TOKEN
 - dmabuf: Be more defensive when importing unknown formats to GL
 - dmabuf: Use narrow range for YUV
- - vulkan: Recreate swapchains when necessary or beneficial

 * GSK:
 - Improve logging for GDK_DEBUG=offload
 - Improve logging for GSK_DEBUG=renderer
 - gpu: Warn about inefficient texture import
- - gpu: Handle tiny offscreens correctly
+ - gpu: Handle  tiny offscreens correctly
 - vulkan: Add profiler marks in various places
 - vulkan: Fix a problem with imported dmabufs showing up black
- - cairo: Speed up mask nodes, since we use them for symbolic icons

 * Wayland:
 - Use wl_compositor version 6
@@ -85,22 +39,13 @@ Overview of Changes in 4.15.1, 21-05-2024

 * Debugging:
 - Show more texture details in the recorder
- - Use GTK_DEBUG=css to see CSS deprecations

 * macOS:
 - Fix problems with events handed back to the OS
 - Respect GDK_DEBUG=default-settings
- - Allow applictions to handle Dock > Quit
-
-* Deprecations:
- - Use of @name colors in CSS

 * Translation updates:
- Catalan
- Georgian
- Hungarian
 Korean
- Portuguese
 Turkish


@@ -15,16 +15,16 @@ spec.
 The following units are supported for basic datatypes:

 Length
-: px, pt, em, ex, rem, pc, in, cm, mm
+: px, pt, em, ex, rem, pc, in, cm, mm, calc()

 Percentage
-: %
+: %, calc()

 Angle
-: deg, rad, grad, turn
+: deg, grad, turn, calc()

 Time
-: s, ms
+: s, ms, calc()

 Length values with the em or ex units are resolved using the font
 size value, unless they occur in setting the font-size itself, in
@@ -33,15 +33,11 @@ which case they are resolved using the inherited font size value.
 The rem unit is resolved using the initial font size value, which is
 not quite the same as the CSS definition of rem.

-Length values using physical units (pt, pc, in, cm, mm) are translated
-to px using the dpi value specified by the -gtk-dpi property, which is
-different from the CSS definition, which uses a fixed dpi of 96.
-
-The calc() notation adds considerable expressive power to all of these
-datatypes. There are limits on what types can be combined in such an
-expression (e.g. it does not make sense to add a number and a time).
-For the full details, see the
-[CSS Values and Units](https://www.w3.org/TR/css-values-4/) spec.
+The calc() notation adds considerable expressive power. There are limits
+on what types can be combined in such an expression (e.g. it does not make
+sense to add a number and a time). For the full details, see the
+[CSS3 Values and Units](https://www.w3.org/TR/css3-values/#calc-notation)
+spec.

 A common pattern among shorthand properties (called 'four sides') is one
 where one to four values can be specified, to determine a value for each
@@ -86,54 +82,36 @@ color: var(--prop, green);

 ## Colors

-### CSS Colors
-
-Colors can be expressed in numerous ways in CSS (see the
-[Color Module](https://www.w3.org/TR/css-color-5/). GTK supports
-many (but not all) of these.
-
-You can use rgb(), rgba(), hsl() with both the legacy or the modern CSS
-syntax, and calc() can be used as well in color expressions. hwb(), oklab(),
-oklch(), color(), color-mix() and relative colors are supported as well.
-
-### Non-CSS Colors
-
-GTK  extends the CSS syntax with several additional ways to specify colors.
-
-These extensions are deprecated and should be replaced by the equivalent
-standard CSS notions.
+GTK extends the CSS syntax with several additional ways to specify colors.

 The first is a reference to a color defined via a @define-color rule in CSS.
 The syntax for @define-color rules is as follows:

 ```
-@define-color name color
+@define-color Name Color
 ```

 To refer to the color defined by a @define-color rule, prefix the name with @.

-The standard CSS mechanisms that should be used instead of @define-color are
-custom properties, :root and var().
-
 GTK also supports color expressions, which allow colors to be transformed to
 new ones. Color expressions can be nested, providing a rich language to
 define colors. Color expressions resemble functions, taking 1 or more colors
 and in some cases a number as arguments.

-`lighter(color)`
- : produces a brighter variant of `color`.
+`lighter(Color)`
+ : produces a brighter variant of Color

-`darker(color)`
- : produces a darker variant of `color`.
+`darker(Color)`
+ : produces a darker variant of Color

-`shade(color, number)`
- : changes the lightness of `color`. The `number` ranges from 0 for black to 2 for white.
+`shade(Color, Number)`
+ : changes the lightness of Color. The number ranges from 0 for black to 2 for white.

-`alpha(color, number)`
- : multiplies the alpha value of `color` by `number` (between 0 and 1).
+`alpha(Color, Number)`
+ : replaces the alpha value of color with number (between 0 and 1)

-`mix(color1, color2, number)`
- : interpolates between the two colors.
+`mix(Color1, Color2, Number)`
+ : interpolates between the two colors

 ## Images

@@ -141,7 +119,7 @@ GTK extends the CSS syntax for images and also uses it for specifying icons.
 To load a themed icon, use

 ```
-gtk-icontheme(name)
+-gtk-icontheme(Name)
 ```

 The specified icon name is used to look up a themed icon, while taking into
@@ -170,14 +148,14 @@ and the
 syntax makes this available. -gtk-recolor requires a url as first argument.
 The remaining arguments specify the color palette to use. If the palette is
 not explicitly specified, the current value of the -gtk-icon-palette property
-is used.
+is used. 

 GTK supports scaled rendering on hi-resolution displays. This works best if
 images can specify normal and hi-resolution variants. From CSS, this can be
 done with

 ```
-gtk-scaled(image1, image2)
+-gtk-scaled(Image1, Image2)
 ```

 ## GTK CSS Properties
@@ -18,7 +18,6 @@ SYNOPSIS
 |
 |   **gtk4-rendernode-tool** benchmark [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** compare [OPTIONS...] <FILE1> <FILE2>
-|   **gtk4-rendernode-tool** extract [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
 |   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
@@ -100,15 +99,3 @@ exit code is 1. If the images are identical, it is 0.
 ``--quiet``

  Don't write results to stdout.
-
-
-Extract
-^^^^^^^
-
-The ``extract`` command saves all the data urls found in a node file to a given
-directory. The file names for the extracted files are derived from the mimetype
-of the url.
-
-``--dir=DIRECTORY``
-
-  Save extracted files in ``DIRECTORY`` (defaults to the current directory).
@@ -77,13 +77,11 @@ content_files = [
  "section-tree-widget.md",
  "migrating-2to4.md",
  "migrating-3to4.md",
-  "migrating-4to5.md",
  "broadway.md",
  "osx.md",
  "wayland.md",
  "windows.md",
  "x11.md",
-  "tools.md",
  "visual_index.md",
 ]
 content_images = [
@@ -14,7 +14,6 @@ expand_content_md_files = [
  'running.md',
  'migrating-2to4.md',
  'migrating-3to4.md',
-  'migrating-4to5.md',
  'actions.md',
  'input-handling.md',
  'drawing-model.md',
@@ -26,8 +25,7 @@ expand_content_md_files = [
  'section-tree-widget.md',
  'section-list-widget.md',
  'question_index.md',
-  'visual_index.md',
-  'tools.md',
+  'visual_index.md'
 ]

 gtk_images = []
@@ -62,39 +60,39 @@ if get_option('documentation')
    build_by_default: true,
    install: true,
    install_dir: docs_dir,
-    install_tag: 'doc',
  )
 endif

-rst2man = find_program('rst2man', 'rst2man.py', required: get_option('man-pages'))
-rst2html5 = find_program('rst2html5', 'rst2html5.py', required: get_option('documentation'))
-
-rst_files = [
-  [ 'gtk4-broadwayd', '1' ],
-  [ 'gtk4-builder-tool', '1' ],
-  [ 'gtk4-encode-symbolic-svg', '1', ],
-  [ 'gtk4-launch', '1', ],
-  [ 'gtk4-query-settings', '1', ],
-  [ 'gtk4-rendernode-tool', '1' ],
-  [ 'gtk4-update-icon-cache', '1', ],
-  [ 'gtk4-path-tool', '1', ],
-]
-
-if get_option('build-demos')
-  rst_files += [
-    [ 'gtk4-demo', '1', ],
-    [ 'gtk4-demo-application', '1', ],
-    [ 'gtk4-widget-factory', '1', ],
-    [ 'gtk4-icon-browser', '1', ],
-    [ 'gtk4-node-editor', '1', ],
-  ]
+rst2man = find_program('rst2man', 'rst2man.py', required: false)
+if get_option('man-pages') and not rst2man.found()
+  error('No rst2man found, but man pages were explicitly enabled')
 endif

-rst2x_flags = [
-  '--syntax-highlight=none',
-]
+if get_option('man-pages') and rst2man.found()
+  rst_files = [
+    [ 'gtk4-broadwayd', '1' ],
+    [ 'gtk4-builder-tool', '1' ],
+    [ 'gtk4-encode-symbolic-svg', '1', ],
+    [ 'gtk4-launch', '1', ],
+    [ 'gtk4-query-settings', '1', ],
+    [ 'gtk4-rendernode-tool', '1' ],
+    [ 'gtk4-update-icon-cache', '1', ],
+    [ 'gtk4-path-tool', '1', ],
+  ]

-if get_option('man-pages')
+  if get_option('build-demos')
+    rst_files += [
+      [ 'gtk4-demo', '1', ],
+      [ 'gtk4-demo-application', '1', ],
+      [ 'gtk4-widget-factory', '1', ],
+      [ 'gtk4-icon-browser', '1', ],
+      [ 'gtk4-node-editor', '1', ],
+    ]
+  endif
+
+  rst2man_flags = [
+    '--syntax-highlight=none',
+  ]

  foreach rst: rst_files
    man_name = rst[0]
@@ -105,34 +103,12 @@ if get_option('man-pages')
      output: '@0@.@1@'.format(man_name, man_section),
      command: [
        rst2man,
-        rst2x_flags,
+        rst2man_flags,
        '@INPUT@',
      ],
      capture: true,
      install: true,
      install_dir: get_option('mandir') / 'man@0@'.format(man_section),
-      install_tag: 'doc',
-    )
-  endforeach
-endif
-
-if get_option('documentation')
-
-  foreach rst: rst_files
-    man_name = rst[0]
-
-    custom_target(
-      input: '@0@.rst'.format(man_name),
-      output: '@0@.html'.format(man_name),
-      command: [
-        rst2html5,
-        rst2x_flags,
-        '@INPUT@',
-      ],
-      capture: true,
-      install: true,
-      install_dir: docs_dir / 'gtk4',
-      install_tag: 'doc',
    )
  endforeach
 endif
@@ -58,7 +58,7 @@ use a GtkLabel.
 If you have a need for custom drawing that fits into the current
 (dark or light) theme, e.g. for rendering a graph, you can still
 get the current style foreground color, using
-[method@Gtk.Widget.get_color].
+[method@Gtk.Widget.get_style_color].

 ## Local stylesheets are going away

@@ -73,103 +73,6 @@ GTK 5 will no longer provide this functionality. The recommendations
 is to use a global stylesheet (i.e. gtk_style_context_add_provider_for_display())
 and rely on style classes to make your CSS apply only where desired.

-## Non-standard CSS extensions are going away
-
-GTK's CSS machinery has a some non-standard extensions around colors:
-named colors with \@define-color and color functions: lighter(), darker(),
-shade(), alpha(), mix().
-
-GTK now implements equivalent functionality from the CSS specs.
-
-### \@define-color is going away
-
-\@define-color should be replaced by custom properties in the :root scope.
-
-Instead of
-
-```
-@define-color fg_color #2e3436
-
-...
-
-box {
-  color: @fg_color;
-}
-```
-
-use
-
-```
-:root {
-  --fg-color: #2e3436;
-}
-
-...
-
-box {
-  color: var(--fg-color);
-}
-```
-
-For more information about custom CSS properties and variables, see the
-[CSS Custom Properties for Cascading Variables](https://www.w3.org/TR/css-variables-1/)
-spec.
-
-### Color expressions are going away
-
-The color functions can all be replaced by combinations of calc() and color-mix().
-
-ligher(c) and darker(c) are just shade(c, 1.3) or shade(c, 0.7), respectively, and
-thus can be handled the same way as shade in the examples below.
-
-Replace
-
-```
-a {
-  color: mix(red, green, 0.8);
-}
-
-b {
-  color: alpha(green, 0.6);
-}
-
-c {
-  color: shade(red, 1.3);
-}
-
-d {
-  color: shade(red, 0.7);
-}
-```
-
-with
-
-```
-a {
-  color: color-mix(in srgb, red, green 80%);
-}
-
-b {
-  color: rgb(from green, r g b / calc(alpha * 0.6));
-}
-
-c {
-  color: hsl(from red, h calc(s * 1.3) calc(l * 1.3));
-}
-
-d {
-  color: hsl(from red, h calc(s * 0.7) calc(l * 0.7));
-}
-```
-
-Variations of these replacements are possible.
-
-Note that GTK has historically computed mix() and shade() values in the SRGB and HSL
-colorspaces, but using OKLAB instead might yield slightly better results.
-
-For more information about color-mix(), see the
-[CSS Color](https://drafts.csswg.org/css-color-5) spec.
-
 ## Chooser interfaces are going away

 The GtkColorChooser, GtkFontChooser, GtkFileChooser and GtkAppChooser
@@ -64,6 +64,6 @@ GTK is divided into three parts:
 [cairo]: https://www.cairographics.org/manual/
 [opengl]: https://www.opengl.org/about/
 [vulkan]: https://www.vulkan.org/
-[pango]: https://docs.gtk.org/Pango/
+[pango]: https://docs.gtk.org/pango/
 [gdkpixbuf]: https://docs.gtk.org/gdk-pixbuf/
 [graphene]: https://ebassi.github.io/graphene/
@@ -1,18 +0,0 @@
-Title: Tools and Demos
-
-GTK ships with a number of tools and demos that come with their own
-documentation in the form of man pages.
-
- - [gtk4-broadwayd](gtk4-broadwayd.html)
- - [gtk4-builder-tool](gtk4-builder-tool.html)
- - [gtk4-demo](gtk4-demo.html)
- - [gtk4-demo-application](gtk4-demo-application.html)
- - [gtk4-encode-symbolic-svg](gtk4-encode-symbolic-svg.html)
- - [gtk4-icon-browser](gtk4-icon-browser.html)
- - [gtk4-launch](gtk4-launch.html)
- - [gtk4-node-editor](gtk4-node-editor.html)
- - [gtk4-path-tool](gtk4-path-tool.html)
- - [gtk4-query-settings](gtk4-query-settings.html)
- - [gtk4-rendernode-tool](gtk4-rendernode-tool.html)
- - [gtk4-update-icon-cache](gtk4-update-icon-cache.html)
- - [gtk4-widget-factory](gtk4-widget-factory.html)
@@ -41,10 +41,8 @@ G_BEGIN_DECLS

 #ifdef GDK_ARRAY_NULL_TERMINATED
 #define GDK_ARRAY_REAL_SIZE(_size) ((_size) + 1)
-#define GDK_ARRAY_MAX_SIZE (G_MAXSIZE / sizeof (_T_) - 1)
 #else
 #define GDK_ARRAY_REAL_SIZE(_size) (_size)
-#define GDK_ARRAY_MAX_SIZE (G_MAXSIZE / sizeof (_T_))
 #endif

 /* make this readable */
@@ -179,23 +177,18 @@ G_GNUC_UNUSED static inline void
 gdk_array(reserve) (GdkArray *self,
                    gsize      n)
 {
-  gsize new_capacity, size, capacity;
+  gsize new_size, size;

-  if (G_UNLIKELY (n > GDK_ARRAY_MAX_SIZE))
-    g_error ("requesting array size of %zu, but maximum size is %zu", n, GDK_ARRAY_MAX_SIZE);
-
-  capacity = gdk_array(get_capacity) (self);
-  if (n <= capacity)
-     return;
+  if (n <= gdk_array(get_capacity) (self))
+    return;

  size = gdk_array(get_size) (self);
-  /* capacity * 2 can overflow, that's why we MAX() */
-  new_capacity = MAX (GDK_ARRAY_REAL_SIZE (n), capacity * 2);
+  new_size = ((gsize) 1) << g_bit_storage (MAX (GDK_ARRAY_REAL_SIZE (n), 16) - 1);

 #ifdef GDK_ARRAY_PREALLOC
  if (self->start == self->preallocated)
    {
-      self->start = g_new (_T_, new_capacity);
+      self->start = g_new (_T_, new_size);
      memcpy (self->start, self->preallocated, sizeof (_T_) * GDK_ARRAY_REAL_SIZE (size));
    }
  else
@@ -203,15 +196,15 @@ gdk_array(reserve) (GdkArray *self,
 #ifdef GDK_ARRAY_NULL_TERMINATED
  if (self->start == NULL)
    {
-      self->start = g_new (_T_, new_capacity);
+      self->start = g_new (_T_, new_size);
      *self->start = *(_T_[1]) { 0 };
    }
  else
 #endif
-    self->start = g_renew (_T_, self->start, new_capacity);
+    self->start = g_renew (_T_, self->start, new_size);

  self->end = self->start + size;
-  self->end_allocation = self->start + new_capacity;
+  self->end_allocation = self->start + new_size;
 #ifdef GDK_ARRAY_NULL_TERMINATED
  self->end_allocation--;
 #endif
@@ -319,7 +312,6 @@ gdk_array(get) (const GdkArray *self,
 #undef gdk_array_paste
 #undef gdk_array
 #undef GDK_ARRAY_REAL_SIZE
-#undef GDK_ARRAY_MAX_SIZE

 #undef GDK_ARRAY_BY_VALUE
 #undef GDK_ARRAY_ELEMENT_TYPE
@@ -522,6 +522,8 @@ gdk_clipboard_get_content (GdkClipboard *clipboard)
 *
 * If the clipboard is not local, this function does nothing but report success.
 *
+ * The @callback must call [method@Gdk.Clipboard.store_finish].
+ *
 * The purpose of this call is to preserve clipboard contents beyond the
 * lifetime of an application, so this function is typically called on
 * exit. Depending on the platform, the functionality may not be available
@@ -636,6 +638,9 @@ gdk_clipboard_read_internal (GdkClipboard        *clipboard,
 * Asynchronously requests an input stream to read the @clipboard's
 * contents from.
 *
+ * When the operation is finished @callback will be called. You must then
+ * call [method@Gdk.Clipboard.read_finish] to get the result of the operation.
+ *
 * The clipboard will choose the most suitable mime type from the given list
 * to fulfill the request, preferring the ones listed first.
 */
@@ -829,6 +834,9 @@ gdk_clipboard_read_value_internal (GdkClipboard        *clipboard,
 * Asynchronously request the @clipboard contents converted to the given
 * @type.
 *
+ * When the operation is finished @callback will be called. You must then call
+ * [method@Gdk.Clipboard.read_value_finish] to get the resulting `GValue`.
+ *
 * For local clipboard contents that are available in the given `GType`,
 * the value will be copied directly. Otherwise, GDK will try to use
 * [func@content_deserialize_async] to convert the clipboard's data.
@@ -887,6 +895,9 @@ gdk_clipboard_read_value_finish (GdkClipboard  *clipboard,
 *
 * Asynchronously request the @clipboard contents converted to a `GdkPixbuf`.
 *
+ * When the operation is finished @callback will be called. You must then
+ * call [method@Gdk.Clipboard.read_texture_finish] to get the result.
+ *
 * This is a simple wrapper around [method@Gdk.Clipboard.read_value_async].
 * Use that function or [method@Gdk.Clipboard.read_async] directly if you
 * need more control over the operation.
@@ -949,6 +960,9 @@ gdk_clipboard_read_texture_finish (GdkClipboard  *clipboard,
 *
 * Asynchronously request the @clipboard contents converted to a string.
 *
+ * When the operation is finished @callback will be called. You must then
+ * call [method@Gdk.Clipboard.read_text_finish] to get the result.
+ *
 * This is a simple wrapper around [method@Gdk.Clipboard.read_value_async].
 * Use that function or [method@Gdk.Clipboard.read_async] directly if you
 * need more control over the operation.
@@ -540,6 +540,9 @@ deserialize_not_found (GdkContentDeserializer *deserializer)
 *
 * The default I/O priority is %G_PRIORITY_DEFAULT (i.e. 0), and lower numbers
 * indicate a higher priority.
+ *
+ * When the operation is finished, @callback will be called. You must then
+ * call [func@Gdk.content_deserialize_finish] to get the result of the operation.
 */
 void
 gdk_content_deserialize_async (GInputStream        *stream,
@@ -279,6 +279,10 @@ gdk_content_provider_content_changed (GdkContentProvider *provider)
 * Asynchronously writes the contents of @provider to @stream in the given
 * @mime_type.
 *
+ * When the operation is finished @callback will be called. You must then call
+ * [method@Gdk.ContentProvider.write_mime_type_finish] to get the result
+ * of the operation.
+ *
 * The given mime type does not need to be listed in the formats returned by
 * [method@Gdk.ContentProvider.ref_formats]. However, if the given `GType` is
 * not supported, `G_IO_ERROR_NOT_SUPPORTED` will be reported.
@@ -546,6 +546,9 @@ serialize_not_found (GdkContentSerializer *serializer)
 *
 * The default I/O priority is %G_PRIORITY_DEFAULT (i.e. 0), and lower numbers
 * indicate a higher priority.
+ *
+ * When the operation is finished, @callback will be called. You must then
+ * call [func@Gdk.content_serialize_finish] to get the result of the operation.
 */
 void
 gdk_content_serialize_async (GOutputStream       *stream,
@@ -52,7 +52,7 @@ GdkCursor*  gdk_cursor_new_from_name     (const char      *name,
                                          GdkCursor       *fallback);

 /**
- * GdkCursorGetTextureCallback:
+ * GdkCursorGetTestureCallback:
 * @cursor: the `GdkCursor`
 * @cursor_size: the nominal cursor size, in application pixels
 * @scale: the device scale
@@ -62,13 +62,6 @@ struct _GdkDmabufTextureClass
  GdkTextureClass parent_class;
 };

-/**
- * gdk_dmabuf_error_quark:
- *
- * Registers an error quark for [class@Gdk.DmabufTexture] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-dmabuf-error-quark, gdk_dmabuf_error)

 G_DEFINE_TYPE (GdkDmabufTexture, gdk_dmabuf_texture, GDK_TYPE_TEXTURE)
@@ -134,7 +134,7 @@ gdk_drop_read_local_async (GdkDrop             *self,

  g_object_get (priv->drag, "content", &content, NULL);
  content_formats = gdk_content_provider_ref_formats (content);
-  g_object_unref (content);
+  g_object_unref (content); 
  content_formats = gdk_content_formats_union_serialize_mime_types (content_formats);
  mime_type = gdk_content_formats_match_mime_type (content_formats, formats);

@@ -784,7 +784,7 @@ gdk_drop_read_value_internal (GdkDrop             *self,
  GdkContentFormats *formats;
  GValue *value;
  GTask *task;
-
+ 
  g_return_if_fail (priv->state != GDK_DROP_STATE_FINISHED);

  task = g_task_new (self, cancellable, callback, user_data);
@@ -849,6 +849,10 @@ gdk_drop_read_value_internal (GdkDrop             *self,
 * Asynchronously request the drag operation's contents converted
 * to the given @type.
 *
+ * When the operation is finished @callback will be called. You must
+ * then call [method@Gdk.Drop.read_value_finish] to get the resulting
+ * `GValue`.
+ *
 * For local drag-and-drop operations that are available in the given
 * `GType`, the value will be copied directly. Otherwise, GDK will
 * try to use [func@Gdk.content_deserialize_async] to convert the data.
@@ -1371,8 +1371,6 @@ gdk_event_get_modifier_state (GdkEvent *event)
 * Extract the event surface relative x/y coordinates from an event.
 *
 * This position is in [surface coordinates](coordinates.html).
- *
- * Returns: whether the positions were set
 */
 gboolean
 gdk_event_get_position (GdkEvent *event,
@@ -152,13 +152,6 @@ enum {

 static GParamSpec *properties[LAST_PROP] = { NULL, };

-/**
- * gdk_gl_error_quark:
- *
- * Registers an error quark for [class@Gdk.GLContext] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-gl-error-quark, gdk_gl_error)

 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkGLContext, gdk_gl_context, GDK_TYPE_DRAW_CONTEXT)
@@ -396,18 +396,10 @@ gboolean
 */
 char *
 gdk_rgba_to_string (const GdkRGBA *rgba)
-{
-  return g_string_free (gdk_rgba_print (rgba, g_string_new ("")), FALSE);
-}
-
-GString *
-gdk_rgba_print (const GdkRGBA *rgba,
-                GString       *string)
 {
  if (rgba->alpha > 0.999)
    {
-      g_string_append_printf (string,
-                              "rgb(%d,%d,%d)",
+      return g_strdup_printf ("rgb(%d,%d,%d)",
                              (int)(0.5 + CLAMP (rgba->red, 0., 1.) * 255.),
                              (int)(0.5 + CLAMP (rgba->green, 0., 1.) * 255.),
                              (int)(0.5 + CLAMP (rgba->blue, 0., 1.) * 255.));
@@ -418,15 +410,12 @@ gdk_rgba_print (const GdkRGBA *rgba,

      g_ascii_formatd (alpha, G_ASCII_DTOSTR_BUF_SIZE, "%g", CLAMP (rgba->alpha, 0, 1));

-      g_string_append_printf (string,
-                              "rgba(%d,%d,%d,%s)",
+      return g_strdup_printf ("rgba(%d,%d,%d,%s)",
                              (int)(0.5 + CLAMP (rgba->red, 0., 1.) * 255.),
                              (int)(0.5 + CLAMP (rgba->green, 0., 1.) * 255.),
                              (int)(0.5 + CLAMP (rgba->blue, 0., 1.) * 255.),
                              alpha);
    }
-
-  return string;
 }

 static gboolean
@@ -72,8 +72,5 @@ _gdk_rgba_equal (gconstpointer p1,
         rgba1->alpha == rgba2->alpha;
 }

-GString * gdk_rgba_print (const GdkRGBA *rgba,
-                          GString       *string);
-
 G_END_DECLS

@@ -50,13 +50,6 @@
 #include "loaders/gdktiffprivate.h"
 #include "loaders/gdkjpegprivate.h"

-/**
- * gdk_texture_error_quark:
- *
- * Registers an error quark for [class@Gdk.Texture] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-texture-error-quark, gdk_texture_error)

 /* HACK: So we don't need to include any (not-yet-created) GSK or GTK headers */
@@ -767,6 +767,9 @@ gdk_toplevel_titlebar_gesture (GdkToplevel        *toplevel,
 * This function asynchronously obtains a handle for a toplevel surface
 * that can be passed to other processes.
 *
+ * When a handle has been obtained, @callback will be called, and can
+ * receive the handle via [method@Gdk.Toplevel.export_handle_finish].
+ *
 * It is an error to call this function on a surface that is already
 * exported.
 *
@@ -118,12 +118,9 @@ typedef enum

 /**
 * GdkTitlebarGesture:
- * @GDK_TITLEBAR_GESTURE_DOUBLE_CLICK: double click gesture
- * @GDK_TITLEBAR_GESTURE_RIGHT_CLICK: right click gesture
- * @GDK_TITLEBAR_GESTURE_MIDDLE_CLICK: middle click gesture
- *
- * The kind of title bar gesture to emit with
- * [method@Gdk.Toplevel.titlebar_gesture].
+ * @GDK_TITLEBAR_GESTURE_DOUBLE_CLICK:
+ * @GDK_TITLEBAR_GESTURE_RIGHT_CLICK:
+ * @GDK_TITLEBAR_GESTURE_MIDDLE_CLICK:
 *
 * Since: 4.4
 */
@@ -94,13 +94,6 @@ enum {
  LAST_SIGNAL
 };

-/**
- * gdk_vulkan_error_quark:
- *
- * Registers an error quark for [class@Gdk.VulkanContext] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gdk-vulkan-error-quark, gdk_vulkan_error)

 static guint signals[LAST_SIGNAL] = { 0 };
@@ -614,8 +607,7 @@ physical_device_check_features (VkPhysicalDevice device)
    features |= GDK_VULKAN_FEATURE_YCBCR;

  if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME) &&
-      physical_device_supports_extension (device, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME) &&
-      physical_device_supports_extension (device, VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME))
+      physical_device_supports_extension (device, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME))
    features |= GDK_VULKAN_FEATURE_DMABUF;

  if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME))
@@ -1525,7 +1517,6 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,

                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME);
                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
-                  g_ptr_array_add (device_extensions, (gpointer) VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME);

                  g_ptr_array_add (device_extensions, (gpointer) VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME);
                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME);
@@ -1866,9 +1857,8 @@ gdk_display_unref_vulkan (GdkDisplay *display)
    {
      g_free (key);
      vkDestroyShaderModule (display->vk_device,
-                             *((VkShaderModule *)value),
+                             value,
                             NULL);
-      g_free (value);
    }
  g_hash_table_unref (display->vk_shader_modules);

@@ -1996,13 +1986,13 @@ VkShaderModule
 gdk_display_get_vk_shader_module (GdkDisplay *self,
                                  const char *resource_name)
 {
-  VkShaderModule *shader;
+  VkShaderModule shader;
  GError *error = NULL;
  GBytes *bytes;

  shader = g_hash_table_lookup (self->vk_shader_modules, resource_name);
  if (shader)
-    return *shader;
+    return shader;

  bytes = g_resources_lookup_data (resource_name, 0, &error);
  if (bytes == NULL)
@@ -2012,7 +2002,6 @@ gdk_display_get_vk_shader_module (GdkDisplay *self,
      return VK_NULL_HANDLE;
    }

-  shader = g_new0 (VkShaderModule, 1);
  if (GDK_VK_CHECK (vkCreateShaderModule, self->vk_device,
                                          &(VkShaderModuleCreateInfo) {
                                              .sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
@@ -2020,20 +2009,18 @@ gdk_display_get_vk_shader_module (GdkDisplay *self,
                                              .pCode = (uint32_t *) g_bytes_get_data (bytes, NULL),
                                          },
                                          NULL,
-                                          shader) == VK_SUCCESS)
+                                          &shader) == VK_SUCCESS)
    {
      g_hash_table_insert (self->vk_shader_modules, g_strdup (resource_name), shader);
    }
  else
    {
-      g_free (shader);
-
-      return VK_NULL_HANDLE;
+      shader = VK_NULL_HANDLE;
    }

  g_bytes_unref (bytes);

-  return *shader;
+  return shader;
 }

 #else /* GDK_RENDERING_VULKAN */
@@ -96,12 +96,12 @@ _gdk_macos_drag_surface_constructed (GObject *object)
                                                 defer:NO
                                                screen:screen];

-  _gdk_macos_surface_set_native (self, window);
-
  [window setOpaque:NO];
  [window setBackgroundColor:[NSColor clearColor]];
  [window setDecorated:NO];

+  _gdk_macos_surface_set_native (self, window);
+
  frame_clock = _gdk_frame_clock_idle_new ();
  gdk_surface_set_frame_clock (surface, frame_clock);
  g_object_unref (frame_clock);
@@ -52,7 +52,6 @@ gdk_macos_popup_surface_layout (GdkMacosPopupSurface *self,
  GdkRectangle bounds;
  GdkRectangle final_rect;
  int x, y;
-  int shadow_left, shadow_right, shadow_top, shadow_bottom;

  g_assert (GDK_IS_MACOS_POPUP_SURFACE (self));
  g_assert (layout != NULL);
@@ -69,19 +68,10 @@ gdk_macos_popup_surface_layout (GdkMacosPopupSurface *self,
    monitor = _gdk_macos_surface_get_best_monitor (GDK_MACOS_SURFACE (self));
  gdk_macos_monitor_get_workarea (monitor, &bounds);

-  gdk_popup_layout_get_shadow_width (layout,
-                                     &shadow_left,
-                                     &shadow_right,
-                                     &shadow_top,
-                                     &shadow_bottom);
-
  gdk_surface_layout_popup_helper (GDK_SURFACE (self),
                                   width,
                                   height,
-                                   shadow_left,
-                                   shadow_right,
-                                   shadow_top,
-                                   shadow_bottom,
+                                   0, 0, 0, 0, /* shadow-left/right/top/bottom */
                                   monitor,
                                   &bounds,
                                   self->layout,
@@ -316,14 +306,14 @@ _gdk_macos_popup_surface_constructed (GObject *object)
                                                 defer:NO
                                                screen:screen];

-  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
-
  [window setOpaque:NO];
  [window setBackgroundColor:[NSColor clearColor]];
  [window setDecorated:NO];
  [window setExcludedFromWindowsMenu:YES];
  [window setLevel:NSPopUpMenuWindowLevel];

+  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
+
  gdk_surface_set_frame_clock (surface, gdk_surface_get_frame_clock (surface->parent));

  GDK_END_MACOS_ALLOC_POOL;
@@ -591,11 +591,11 @@ _gdk_macos_toplevel_surface_constructed (GObject *object)
                                                 defer:NO
                                                screen:screen];

-  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
-
  /* Allow NSWindow to go fullscreen */
  [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];

+  _gdk_macos_surface_set_native (GDK_MACOS_SURFACE (self), window);
+
  frame_clock = _gdk_frame_clock_idle_new ();
  gdk_surface_set_frame_clock (surface, frame_clock);
  g_object_unref (frame_clock);
@@ -128,8 +128,8 @@ install_headers(gdk_deprecated_headers, subdir: 'gtk-4.0/gdk/deprecated')
 gdk_sources = gdk_public_sources + gdk_deprecated_sources

 gdk_private_h_sources = files([
-  'gdkdevicetoolprivate.h',
  'gdkeventsprivate.h',
+  'gdkdevicetoolprivate.h',
  'gdkhslaprivate.h',
  'gdkmonitorprivate.h',
  'gdkseatdefaultprivate.h',
@@ -165,29 +165,25 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
                                double            *scale)
 {
  GdkTexture *texture;
+  int desired_scale_factor;
+
+  desired_scale_factor = (int) ceil (desired_scale);

  if (gdk_cursor_get_name (cursor))
    {
      struct wl_cursor *c;
-      int scale_factor;

      if (g_str_equal (gdk_cursor_get_name (cursor), "none"))
-        {
-          *hotspot_x = *hotspot_y = 0;
-          *width = *height = 0;
-          *scale = 1;
-          return NULL;
-        }
-
-      scale_factor = (int) ceil (desired_scale);
+        goto none;

      c = gdk_wayland_cursor_load_for_name (display,
-                                            display->cursor_theme,
-                                            scale_factor,
+                                            _gdk_wayland_display_get_cursor_theme (display),
+                                            desired_scale_factor,
                                            gdk_cursor_get_name (cursor));
      if (c && c->image_count > 0)
        {
          struct wl_cursor_image *image;
+          int cursor_scale;

          if (image_index >= c->image_count)
            {
@@ -199,23 +195,23 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,

          image = c->images[image_index];

-          *width = display->cursor_theme_size;
-          *height = display->cursor_theme_size;
-          *scale = image->width / (double) *width;
-          *hotspot_x = image->hotspot_x / scale_factor;
-          *hotspot_y = image->hotspot_y / scale_factor;
-
-          if (*scale != scale_factor && !use_viewporter)
+          cursor_scale = desired_scale_factor;
+          if ((image->width % cursor_scale != 0) ||
+              (image->height % cursor_scale != 0))
            {
-              g_warning (G_STRLOC " cursor image size (%d) not an integer "
-                         "multiple of theme size (%d)", image->width, *width);
-              *width = image->width;
-              *height = image->height;
-              *hotspot_x = image->hotspot_x;
-              *hotspot_y = image->hotspot_y;
-              *scale = 1;
+              g_warning (G_STRLOC " cursor image size (%dx%d) not an integer "
+                         "multiple of scale (%d)", image->width, image->height,
+                         cursor_scale);
+              cursor_scale = 1;
            }

+          *hotspot_x = image->hotspot_x / cursor_scale;
+          *hotspot_y = image->hotspot_y / cursor_scale;
+
+          *width = image->width / cursor_scale;
+          *height = image->height / cursor_scale;
+          *scale = cursor_scale;
+
          return wl_cursor_image_get_buffer (image);
        }
    }
@@ -261,7 +257,7 @@ from_texture:
  else
    {
      if (!use_viewporter)
-        *scale = ceil (desired_scale);
+        *scale = desired_scale_factor;
      else
        *scale = desired_scale;

@@ -298,23 +294,28 @@ from_texture:
    }

  if (gdk_cursor_get_fallback (cursor))
-    {
-      return _gdk_wayland_cursor_get_buffer (display,
-                                             gdk_cursor_get_fallback (cursor),
-                                             desired_scale,
-                                             use_viewporter,
-                                             image_index,
-                                             hotspot_x, hotspot_y,
-                                             width, height,
-                                             scale);
-    }
+    return _gdk_wayland_cursor_get_buffer (display,
+                                           gdk_cursor_get_fallback (cursor),
+                                           desired_scale,
+                                           use_viewporter,
+                                           image_index,
+                                           hotspot_x, hotspot_y,
+                                           width, height,
+                                           scale);
  else
    {
      texture = gdk_texture_new_from_resource ("/org/gtk/libgdk/cursor/default");
      goto from_texture;
    }

-  g_assert_not_reached ();
+none:
+  *hotspot_x = 0;
+  *hotspot_y = 0;
+  *width = 0;
+  *height = 0;
+  *scale = 1;
+
+  return NULL;
 }

 guint
@@ -97,7 +97,6 @@
 #define OUTPUT_VERSION_WITH_DONE 2
 #define NO_XDG_OUTPUT_DONE_SINCE_VERSION 3
 #define OUTPUT_VERSION           3
-#define XDG_WM_DIALOG_VERSION    1

 #ifdef HAVE_TOPLEVEL_STATE_SUSPENDED
 #define XDG_WM_BASE_VERSION      6
@@ -383,13 +382,6 @@ gdk_registry_handle_global (void               *data,
    {
      display_wayland->zxdg_shell_v6_id = id;
    }
-  else if (strcmp (interface, "xdg_wm_dialog_v1") == 0)
-    {
-      display_wayland->xdg_wm_dialog =
-        wl_registry_bind (display_wayland->wl_registry, id,
-                          &xdg_wm_dialog_v1_interface,
-                          MIN (version, XDG_WM_DIALOG_VERSION));
-    }
  else if (strcmp (interface, "gtk_shell1") == 0)
    {
      display_wayland->gtk_shell =
@@ -41,7 +41,6 @@
 #include <gdk/wayland/viewporter-client-protocol.h>
 #include <gdk/wayland/presentation-time-client-protocol.h>
 #include <gdk/wayland/single-pixel-buffer-v1-client-protocol.h>
-#include <gdk/wayland/xdg-dialog-v1-client-protocol.h>

 #include <glib.h>
 #include <gdk/gdkkeys.h>
@@ -103,7 +102,6 @@ struct _GdkWaylandDisplay
  DmabufFormatsInfo *dmabuf_formats_info;
  struct xdg_wm_base *xdg_wm_base;
  struct zxdg_shell_v6 *zxdg_shell_v6;
-  struct xdg_wm_dialog_v1 *xdg_wm_dialog;
  struct gtk_shell1 *gtk_shell;
  struct wl_data_device_manager *data_device_manager;
  struct wl_subcompositor *subcompositor;
@@ -3866,25 +3866,9 @@ pointer_surface_leave (void              *data,
  pointer_surface_update_scale (device);
 }

-static void
-pointer_surface_preferred_buffer_scale (void              *data,
-                                        struct wl_surface *wl_surface,
-                                        int32_t            factor)
-{
-}
-
-static void
-pointer_surface_preferred_buffer_transform (void              *data,
-                                            struct wl_surface *wl_surface,
-                                            uint32_t           transform)
-{
-}
-
 static const struct wl_surface_listener pointer_surface_listener = {
  pointer_surface_enter,
-  pointer_surface_leave,
-  pointer_surface_preferred_buffer_scale,
-  pointer_surface_preferred_buffer_transform,
+  pointer_surface_leave
 };

 static void
@@ -37,7 +37,6 @@
 #include <wayland/presentation-time-client-protocol.h>
 #include <wayland/xdg-shell-unstable-v6-client-protocol.h>
 #include <wayland/xdg-foreign-unstable-v2-client-protocol.h>
-#include <wayland/xdg-dialog-v1-client-protocol.h>

 #include <stdlib.h>
 #include <stdio.h>
@@ -85,7 +84,6 @@ struct _GdkWaylandToplevel
    struct gtk_surface1 *gtk_surface;
    struct xdg_toplevel *xdg_toplevel;
    struct zxdg_toplevel_v6 *zxdg_toplevel_v6;
-    struct xdg_dialog_v1 *xdg_dialog;
  } display_server;

  GdkWaylandToplevel *transient_for;
@@ -207,7 +205,6 @@ gdk_wayland_toplevel_clear_saved_size (GdkWaylandToplevel *toplevel)

 static void maybe_set_gtk_surface_dbus_properties (GdkWaylandToplevel *wayland_toplevel);
 static void maybe_set_gtk_surface_modal (GdkWaylandToplevel *wayland_toplevel);
-static gboolean maybe_set_xdg_dialog_modal (GdkWaylandToplevel *wayland_toplevel);

 static void
 gdk_wayland_toplevel_hide_surface (GdkWaylandSurface *wayland_surface)
@@ -218,7 +215,6 @@ gdk_wayland_toplevel_hide_surface (GdkWaylandSurface *wayland_surface)

  g_clear_pointer (&toplevel->display_server.xdg_toplevel, xdg_toplevel_destroy);
  g_clear_pointer (&toplevel->display_server.zxdg_toplevel_v6, zxdg_toplevel_v6_destroy);
-  g_clear_pointer (&toplevel->display_server.xdg_dialog, xdg_dialog_v1_destroy);

  if (toplevel->display_server.gtk_surface)
    {
@@ -881,8 +877,7 @@ gdk_wayland_surface_create_xdg_toplevel (GdkWaylandToplevel *wayland_toplevel)
  gdk_wayland_toplevel_set_application_id (GDK_TOPLEVEL (wayland_toplevel), app_id);

  maybe_set_gtk_surface_dbus_properties (wayland_toplevel);
-  if (!maybe_set_xdg_dialog_modal (wayland_toplevel))
-    maybe_set_gtk_surface_modal (wayland_toplevel);
+  maybe_set_gtk_surface_modal (wayland_toplevel);

  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland surface commit", NULL);
  wl_surface_commit (wayland_surface->display_server.wl_surface);
@@ -1094,40 +1089,12 @@ maybe_set_gtk_surface_modal (GdkWaylandToplevel *wayland_toplevel)

 }

-static gboolean
-maybe_set_xdg_dialog_modal (GdkWaylandToplevel *wayland_toplevel)
-{
-  GdkWaylandDisplay *display_wayland =
-    GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SURFACE (wayland_toplevel)));
-
-  if (!display_wayland->xdg_wm_dialog)
-    return FALSE;
-  if (!is_realized_toplevel (GDK_WAYLAND_SURFACE (wayland_toplevel)))
-    return FALSE;
-
-  if (!wayland_toplevel->display_server.xdg_dialog)
-    {
-      wayland_toplevel->display_server.xdg_dialog =
-        xdg_wm_dialog_v1_get_xdg_dialog (display_wayland->xdg_wm_dialog,
-                                         wayland_toplevel->display_server.xdg_toplevel);
-    }
-
-  if (GDK_SURFACE (wayland_toplevel)->modal_hint)
-    xdg_dialog_v1_set_modal (wayland_toplevel->display_server.xdg_dialog);
-  else
-    xdg_dialog_v1_unset_modal (wayland_toplevel->display_server.xdg_dialog);
-
-  return TRUE;
-}
-
 static void
 gdk_wayland_toplevel_set_modal_hint (GdkWaylandToplevel *wayland_toplevel,
                                     gboolean            modal)
 {
  GDK_SURFACE (wayland_toplevel)->modal_hint = modal;
-
-  if (!maybe_set_xdg_dialog_modal (wayland_toplevel))
-    maybe_set_gtk_surface_modal (wayland_toplevel);
+  maybe_set_gtk_surface_modal (wayland_toplevel);
 }

 void
@@ -48,133 +48,36 @@ gdk_wayland_deps = [
  wlegldep,
 ]

-# Fields:
-#  - name: protocol name
-#  - stability: protocol stability ('private', 'stable' or 'unstable')
-#  - version: protocol version
-#  - required: wayland_protocols version check
+wlmod = import('unstable-wayland')
 proto_sources = [
-  {
-    'name': 'gtk-shell',
-    'stability': 'private',
-  },
-  {
-    'name': 'primary-selection',
-    'stability': 'unstable',
-    'version': 1,
-  },
-  {
-    'name': 'pointer-gestures',
-    'stability': 'unstable',
-    'version': 1,
-  },
-  {
-    'name': 'viewporter',
-    'stability': 'stable',
-  },
-  {
-    'name': 'xdg-shell',
-    'stability': 'unstable',
-    'version': 6,
-  },
-  {
-    'name': 'xdg-shell',
-    'stability': 'stable',
-  },
-  {
-    'name': 'xdg-foreign',
-    'stability': 'unstable',
-    'version': 1,
-  },
-  {
-    'name': 'xdg-foreign',
-    'stability': 'unstable',
-    'version': 2,
-  },
-  {
-    'name': 'tablet',
-    'stability': 'unstable',
-    'version': 2,
-  },
-  {
-    'name': 'keyboard-shortcuts-inhibit',
-    'stability': 'unstable',
-    'version': 1,
-  },
-  {
-    'name': 'server-decoration',
-    'stability': 'private',
-  },
-  {
-    'name': 'xdg-output',
-    'stability': 'unstable',
-    'version': 1,
-  },
-  {
-    'name': 'idle-inhibit',
-    'stability': 'unstable',
-    'version': 1,
-  },
-  {
-    'name': 'xdg-activation',
-    'stability': 'staging',
-    'version': 1,
-  },
-  {
-    'name': 'fractional-scale',
-    'stability': 'staging',
-    'version': 1,
-  },
-  {
-    'name': 'linux-dmabuf',
-    'stability': 'unstable',
-    'version': 1,
-  },
-  {
-    'name': 'presentation-time',
-    'stability': 'stable',
-    'version': 1,
-  },
-  {
-    'name': 'single-pixel-buffer',
-    'stability': 'staging',
-    'version': 1,
-  },
-  {
-    'name': 'xdg-dialog',
-    'stability': 'staging',
-    'version': 1,
-  },
+  'protocol/gtk-shell.xml',
+  'protocol/server-decoration.xml',
+  wlmod.find_protocol('primary-selection', state: 'unstable', version: 1),
+  wlmod.find_protocol('pointer-gestures', state: 'unstable', version: 1),
+  wlmod.find_protocol('viewporter', state: 'stable'),
+  wlmod.find_protocol('xdg-shell', state: 'unstable', version: 6),
+  wlmod.find_protocol('xdg-shell', state: 'stable'),
+  wlmod.find_protocol('xdg-foreign', state: 'unstable', version: 1),
+  wlmod.find_protocol('xdg-foreign', state: 'unstable', version: 2),
+  wlmod.find_protocol('tablet', state: 'unstable', version: 2),
+  wlmod.find_protocol('keyboard-shortcuts-inhibit', state: 'unstable', version: 1),
+  wlmod.find_protocol('xdg-output', state: 'unstable', version: 1),
+  wlmod.find_protocol('idle-inhibit', state: 'unstable', version: 1),
+  wlmod.find_protocol('xdg-activation', state: 'staging', version: 1),
+  wlmod.find_protocol('fractional-scale', state: 'staging', version: 1),
+  wlmod.find_protocol('linux-dmabuf', state: 'unstable', version: 1),
+  wlmod.find_protocol('presentation-time', state: 'stable'),
+  wlmod.find_protocol('single-pixel-buffer', state: 'staging', version: 1),
 ]

 gdk_wayland_gen_headers = []

-wlmod = import('unstable-wayland')
 foreach p: proto_sources
-  if wlprotocolsdep.version().version_compare(p.get('required', '>=0'))
-    if p.get('stability') == 'private'
-      if (p.has_key('version'))
-        proto_file = 'protocol/@0@-v@1@.xml'.format(p.get('name'), p.get('version'))
-      else
-        proto_file = 'protocol/@0@.xml'.format(p.get('name'))
-      endif
-    elif p.get('stability') == 'stable'
-      proto_file = wlmod.find_protocol(p.get('name'),
-        state: p.get('stability'),
-      )
-    else
-      proto_file = wlmod.find_protocol(p.get('name'),
-        state: p.get('stability'),
-        version: p.get('version'),
-      )
-    endif
-
-    # Returns a list [.c, .h]
-    gen = wlmod.scan_xml(proto_file)
-    assert(gen.length() == 2)
-    gdk_wayland_sources += gen[0]
-    gdk_wayland_gen_headers += gen[1]
-  endif
+  # Returns a list [.c, .h]
+  gen = wlmod.scan_xml(p)
+  assert(gen.length() == 2)
+  gdk_wayland_sources += gen[0]
+  gdk_wayland_gen_headers += gen[1]
 endforeach

 libgdk_wayland = static_library('gdk-wayland',
@@ -1408,7 +1408,7 @@ register_clipboard_notification ()
  WNDCLASS wclass = { 0, };
  ATOM klass;

-  wclass.lpszClassName = L"GdkClipboardNotification";
+  wclass.lpszClassName = "GdkClipboardNotification";
  wclass.lpfnWndProc = _clipboard_window_procedure;
  wclass.hInstance = this_module ();
  wclass.cbWndExtra = sizeof (GdkWin32ClipboardThread *);
@@ -1506,9 +1506,9 @@ gdk_win32_clipdrop_init (GdkWin32Clipdrop *win32_clipdrop)
  GdkWin32ContentFormatPair fmt;
  HMODULE                   user32;

-  thread_wakeup_message = RegisterWindowMessage (L"GDK_WORKER_THREAD_WEAKEUP");
+  thread_wakeup_message = RegisterWindowMessage ("GDK_WORKER_THREAD_WEAKEUP");

-  user32 = LoadLibrary (L"user32.dll");
+  user32 = LoadLibrary ("user32.dll");
  win32_clipdrop->GetUpdatedClipboardFormats = (GetUpdatedClipboardFormatsFunc) GetProcAddress (user32, "GetUpdatedClipboardFormats");
  FreeLibrary (user32);

@@ -1557,21 +1557,21 @@ gdk_win32_clipdrop_init (GdkWin32Clipdrop *win32_clipdrop)
   * the lead and map the GDK contentformat "image/png" to the clipboard
   * format name "PNG" etc.
   */
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_PNG) = RegisterClipboardFormat (L"PNG");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_JFIF) = RegisterClipboardFormat (L"JFIF");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_GIF) = RegisterClipboardFormat (L"GIF");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_PNG) = RegisterClipboardFormatA ("PNG");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_JFIF) = RegisterClipboardFormatA ("JFIF");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_GIF) = RegisterClipboardFormatA ("GIF");

-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_UNIFORMRESOURCELOCATORW) = RegisterClipboardFormat (L"UniformResourceLocatorW");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_CFSTR_SHELLIDLIST) = RegisterClipboardFormat (CFSTR_SHELLIDLIST);
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_HTML_FORMAT) = RegisterClipboardFormat (L"HTML Format");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_TEXT_HTML) = RegisterClipboardFormat (L"text/html");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_UNIFORMRESOURCELOCATORW) = RegisterClipboardFormatA ("UniformResourceLocatorW");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_CFSTR_SHELLIDLIST) = RegisterClipboardFormatA (CFSTR_SHELLIDLIST);
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_HTML_FORMAT) = RegisterClipboardFormatA ("HTML Format");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_TEXT_HTML) = RegisterClipboardFormatA ("text/html");

-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_PNG) = RegisterClipboardFormat (L"image/png");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_JPEG) = RegisterClipboardFormat (L"image/jpeg");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_BMP) = RegisterClipboardFormat (L"image/bmp");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_GIF) = RegisterClipboardFormat (L"image/gif");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_TEXT_URI_LIST) = RegisterClipboardFormat (L"text/uri-list");
-  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_TEXT_PLAIN_UTF8) = RegisterClipboardFormat (L"text/plain;charset=utf-8");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_PNG) = RegisterClipboardFormatA ("image/png");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_JPEG) = RegisterClipboardFormatA ("image/jpeg");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_BMP) = RegisterClipboardFormatA ("image/bmp");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_IMAGE_GIF) = RegisterClipboardFormatA ("image/gif");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_TEXT_URI_LIST) = RegisterClipboardFormatA ("text/uri-list");
+  _gdk_cf_array_index (cfs, GDK_WIN32_CF_INDEX_TEXT_PLAIN_UTF8) = RegisterClipboardFormatA ("text/plain;charset=utf-8");

  win32_clipdrop->active_source_drags = g_hash_table_new_full (NULL, NULL, (GDestroyNotify) g_object_unref, NULL);

@@ -2364,9 +2364,9 @@ transmute_cf_dib_to_image_bmp (const guchar    *data,
       * check?
       */
      (IsClipboardFormatAvailable
-       (RegisterClipboardFormat (L"application/x-moz-nativeimage")) ||
+       (RegisterClipboardFormatA ("application/x-moz-nativeimage")) ||
       IsClipboardFormatAvailable
-       (RegisterClipboardFormat (L"UniformResourceLocatorW"))) &&
+       (RegisterClipboardFormatA ("UniformResourceLocatorW"))) &&
 #endif
      TRUE)
    {
@@ -31,13 +31,12 @@

 static struct {
  char *name;
-  const wchar_t *id;
+  char *id;
 } default_cursors[] = {
  /* -- Win32 cursor names: -- */
  { "appstarting", IDC_APPSTARTING },
  { "arrow", IDC_ARROW },
  { "cross", IDC_CROSS },
-  { "dnd-move", IDC_ARROW },
  { "hand",  IDC_HAND },
  { "help",  IDC_HELP },
  { "ibeam", IDC_IBEAM },
@@ -457,32 +456,32 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
        break;
      case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_NULL:
        result = gdk_win32_hcursor_new (display,
-                                        LoadImage (NULL,
-                                                   cursor->resource_name,
-                                                   IMAGE_CURSOR,
-                                                   cursor->width,
-                                                   cursor->height,
-                                                   cursor->load_flags),
+                                        LoadImageA (NULL,
+                                                    (const char *) cursor->resource_name,
+                                                    IMAGE_CURSOR,
+                                                    cursor->width,
+                                                    cursor->height,
+                                                    cursor->load_flags),
                                        cursor->load_flags & LR_SHARED ? FALSE : TRUE);
        break;
      case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_THIS:
        result = gdk_win32_hcursor_new (display,
-                                        LoadImage (GetModuleHandle (NULL),
-                                                   cursor->resource_name,
-                                                   IMAGE_CURSOR,
-                                                   cursor->width,
-                                                   cursor->height,
-                                                   cursor->load_flags),
+                                        LoadImageA (GetModuleHandle (NULL),
+                                                    (const char *) cursor->resource_name,
+                                                    IMAGE_CURSOR,
+                                                    cursor->width,
+                                                    cursor->height,
+                                                    cursor->load_flags),
                                        cursor->load_flags & LR_SHARED ? FALSE : TRUE);
        break;
      case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_GTK:
        result = gdk_win32_hcursor_new (display,
-                                        LoadImage (this_module (),
-                                                   cursor->resource_name,
-                                                   IMAGE_CURSOR,
-                                                   cursor->width,
-                                                   cursor->height,
-                                                   cursor->load_flags),
+                                        LoadImageA (this_module (),
+                                                    (const char *) cursor->resource_name,
+                                                    IMAGE_CURSOR,
+                                                    cursor->width,
+                                                    cursor->height,
+                                                    cursor->load_flags),
                                        cursor->load_flags & LR_SHARED ? FALSE : TRUE);
        break;
      case GDK_WIN32_CURSOR_CREATE:
@@ -499,12 +498,12 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
 }

 static Win32Cursor *
-win32_cursor_new (GdkWin32CursorLoadType  load_type,
-                  wchar_t                *resource_name,
-                  int                     width,
-                  int                     height,
-                  guint                   load_flags,
-                  int                     xcursor_number)
+win32_cursor_new (GdkWin32CursorLoadType load_type,
+                  gpointer               resource_name,
+                  int                    width,
+                  int                    height,
+                  guint                  load_flags,
+                  int                    xcursor_number)
 {
  Win32Cursor *result;

@@ -632,9 +631,9 @@ win32_cursor_theme_load_system (Win32CursorTheme *theme,

      /* Prefer W32 cursors */
      if (cursors[i].builtin)
-        shared_hcursor = LoadImage (NULL, cursors[i].builtin, IMAGE_CURSOR,
-                                    size, size,
-                                    LR_SHARED | (size == 0 ? LR_DEFAULTSIZE : 0));
+        shared_hcursor = LoadImageA (NULL, cursors[i].builtin, IMAGE_CURSOR,
+                                     size, size,
+                                     LR_SHARED | (size == 0 ? LR_DEFAULTSIZE : 0));

      /* Fall back to X cursors, but only if we've got no theme cursor */
      if (shared_hcursor == NULL && g_hash_table_lookup (theme->named_cursors, cursors[i].name) == NULL)
@@ -646,7 +645,7 @@ win32_cursor_theme_load_system (Win32CursorTheme *theme,
        DestroyCursor (x_hcursor);

      cursor = win32_cursor_new (shared_hcursor ? GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_NULL : GDK_WIN32_CURSOR_CREATE,
-                                 (wchar_t*) cursors[i].builtin,
+                                 (gpointer) cursors[i].builtin,
                                 size,
                                 size,
                                 LR_SHARED | (size == 0 ? LR_DEFAULTSIZE : 0),
@@ -661,14 +660,14 @@ win32_cursor_theme_load_system (Win32CursorTheme *theme,
      if (default_cursors[i].name == NULL)
        break;

-      shared_hcursor = LoadImage (NULL, default_cursors[i].id, IMAGE_CURSOR, size, size,
-                                  LR_SHARED | (size == 0 ? LR_DEFAULTSIZE : 0));
+      shared_hcursor = LoadImageA (NULL, default_cursors[i].id, IMAGE_CURSOR, size, size,
+                                   LR_SHARED | (size == 0 ? LR_DEFAULTSIZE : 0));

      if (shared_hcursor == NULL)
        continue;

      cursor = win32_cursor_new (GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_NULL,
-                                 (wchar_t*) default_cursors[i].id,
+                                 (gpointer) default_cursors[i].id,
                                 size,
                                 size,
                                 LR_SHARED | (size == 0 ? LR_DEFAULTSIZE : 0),
@@ -780,8 +779,8 @@ win32hcursor_idc_from_name (GdkWin32Display *display,
        continue;

      return gdk_win32_hcursor_new (display,
-                                    LoadImage (NULL, default_cursors[i].id, IMAGE_CURSOR, 0, 0,
-                                               LR_SHARED | LR_DEFAULTSIZE),
+                                    LoadImageA (NULL, default_cursors[i].id, IMAGE_CURSOR, 0, 0,
+                                                LR_SHARED | LR_DEFAULTSIZE),
                                    FALSE);
    }

@@ -885,7 +884,7 @@ gdk_win32hcursor_create_for_name (GdkWin32Display  *display,
  /* Allow to load named cursor resources linked into the executable.
   * Cursors obtained with LoadCursor() cannot be destroyed.
   */
-  return gdk_win32_hcursor_new (display, LoadCursorA (hinstance, name), FALSE);
+  return gdk_win32_hcursor_new (display, LoadCursor (hinstance, name), FALSE);
 }

 static HICON
@@ -121,7 +121,7 @@ gdk_device_manager_win32_finalize (GObject *object)
 #if DEBUG_WINTAB

 static void
-print_lc(LOGCONTEXTA *lc)
+print_lc(LOGCONTEXT *lc)
 {
  g_print ("lcName = %s\n", lc->lcName);
  g_print ("lcOptions =");
@@ -374,13 +374,13 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)

  wintab_contexts = NULL;

-  n = GetSystemDirectoryA (&dummy, 0);
+  n = GetSystemDirectory (&dummy, 0);

  if (n <= 0)
    return;

  wintab32_dll_path = g_malloc (n + 1 + strlen (WINTAB32_DLL));
-  k = GetSystemDirectoryA (wintab32_dll_path, n);
+  k = GetSystemDirectory (wintab32_dll_path, n);

  if (k == 0 || k > n)
    {
@@ -392,7 +392,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
    strcat (wintab32_dll_path, G_DIR_SEPARATOR_S);
  strcat (wintab32_dll_path, WINTAB32_DLL);

-  if ((wintab32 = LoadLibraryA (wintab32_dll_path)) == NULL)
+  if ((wintab32 = LoadLibrary (wintab32_dll_path)) == NULL)
    return;

  if ((p_WTInfoA = (t_WTInfoA) GetProcAddress (wintab32, "WTInfoA")) == NULL)
@@ -433,7 +433,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)

  for (devix = 0; devix < ndevices; devix++)
    {
-      LOGCONTEXTA lc;
+      LOGCONTEXT lc;

      /* We open the Wintab device (hmm, what if there are several, or
       * can there even be several, probably not?) as a system
@@ -480,7 +480,7 @@ register_display_change_notification (GdkDisplay *display)
  WNDCLASS wclass = { 0, };
  ATOM klass;

-  wclass.lpszClassName = L"GdkDisplayChange";
+  wclass.lpszClassName = "GdkDisplayChange";
  wclass.lpfnWndProc = display_change_window_procedure;
  wclass.hInstance = this_module ();
  wclass.style = CS_OWNDC;
@@ -606,7 +606,7 @@ gdk_win32_display_get_name (GdkDisplay *display)
 	window_station_name = "WinSta0";
    }

-  processIdToSessionId = (PFN_ProcessIdToSessionId) GetProcAddress (GetModuleHandle (L"kernel32.dll"), "ProcessIdToSessionId");
+  processIdToSessionId = (PFN_ProcessIdToSessionId) GetProcAddress (GetModuleHandle ("kernel32.dll"), "ProcessIdToSessionId");
  if (!processIdToSessionId || !processIdToSessionId (GetCurrentProcessId (), &session_id))
    session_id = 0;

@@ -134,7 +134,6 @@ struct _GdkWin32Display
  guint hasWglEXTSwapControl : 1;
  guint hasWglOMLSyncControl : 1;
  guint hasWglARBPixelFormat : 1;
-  guint force_enable_depth_bits : 1;

 #ifdef HAVE_EGL
  guint hasEglKHRCreateContext : 1;
@@ -658,7 +658,7 @@ _gdk_win32_dnd_thread_main (gpointer data)
  /* Create a message queue */
  PeekMessage (&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);

-  thread_wakeup_message = RegisterWindowMessage (L"GDK_WORKER_THREAD_WEAKEUP");
+  thread_wakeup_message = RegisterWindowMessage ("GDK_WORKER_THREAD_WEAKEUP");

  /* Signal the main thread that we're ready.
   * This is the only time the queue works in reverse.
@@ -419,7 +419,7 @@ set_up_low_level_keyboard_hook (void)
  else
    WIN32_API_FAILED ("SetWindowsHookEx");

-  aerosnap_message = RegisterWindowMessage (L"GDK_WIN32_AEROSNAP_MESSAGE");
+  aerosnap_message = RegisterWindowMessage ("GDK_WIN32_AEROSNAP_MESSAGE");
 }

 void
@@ -470,7 +470,7 @@ _gdk_events_init (GdkDisplay *display)
  };
 #endif

-  got_gdk_events_message = RegisterWindowMessage (L"GDK_WIN32_GOT_EVENTS");
+  got_gdk_events_message = RegisterWindowMessage ("GDK_WIN32_GOT_EVENTS");

 #if 0
  /* Check if we have some input locale identifier loaded that uses a
@@ -1685,7 +1685,7 @@ _gdk_win32_surface_fill_min_max_info (GdkSurface  *window,
      nearest_monitor = MonitorFromWindow (GDK_SURFACE_HWND (window), MONITOR_DEFAULTTONEAREST);
      nearest_info.cbSize = sizeof (nearest_info);

-      if (GetMonitorInfo (nearest_monitor, &nearest_info))
+      if (GetMonitorInfoA (nearest_monitor, &nearest_info))
        {
          /* MSDN says that we must specify maximized window
           * size as if it was located on the primary monitor.
@@ -142,7 +142,8 @@ get_wgl_pfd (HDC                    hdc,

  pfd->nSize = sizeof (PIXELFORMATDESCRIPTOR);

-  if (display_win32->hasWglARBPixelFormat)
+  if (display_win32 != NULL &&
+      display_win32->hasWglARBPixelFormat)
    {
      UINT num_formats;
      int colorbits = GetDeviceCaps (hdc, BITSPIXEL);
@@ -175,18 +176,15 @@ get_wgl_pfd (HDC                    hdc,
      pixelAttribs[i++] = WGL_ALPHA_BITS_ARB;
      pixelAttribs[i++] = 8;

+      pixelAttribs[i++] = WGL_DEPTH_BITS_ARB;
+      pixelAttribs[i++] = 0;
+
      pixelAttribs[i++] = WGL_STENCIL_BITS_ARB;
      pixelAttribs[i++] = 0;

      pixelAttribs[i++] = WGL_ACCUM_BITS_ARB;
      pixelAttribs[i++] = 0;

-      if (!display_win32->force_enable_depth_bits)
-        {
-          pixelAttribs[i++] = WGL_DEPTH_BITS_ARB;
-          pixelAttribs[i++] = 0;
-        }
-
      /* end of "Update PIXEL_ATTRIBUTES above if any groups are added here!" */

      pixelAttribs[i++] = 0; /* end of pixelAttribs */
@@ -217,20 +215,8 @@ get_wgl_pfd (HDC                    hdc,
      pfd->cColorBits = GetDeviceCaps (hdc, BITSPIXEL);
      pfd->cAlphaBits = 8;
      pfd->iLayerType = PFD_MAIN_PLANE;
-      pfd->cAccumBits = 0;
-      pfd->cStencilBits = 0;
-
-      if (!display_win32->force_enable_depth_bits)
-        pfd->cDepthBits = 0;

      best_pf = ChoosePixelFormat (hdc, pfd);
-
-      /* try again if driver enforces depth buffers */
-      if (best_pf == 0 && !display_win32->force_enable_depth_bits)
-        {
-          display_win32->force_enable_depth_bits = TRUE;
-          get_wgl_pfd (hdc, pfd, display_win32);
-        }
    }

  return best_pf;
@@ -248,7 +234,7 @@ gdk_init_dummy_wgl_context (GdkWin32Display *display_win32)

  memset (&pfd, 0, sizeof (PIXELFORMATDESCRIPTOR));

-  best_idx = get_wgl_pfd (display_win32->dummy_context_wgl.hdc, &pfd, display_win32);
+  best_idx = get_wgl_pfd (display_win32->dummy_context_wgl.hdc, &pfd, NULL);

  if (best_idx != 0)
    set_pixel_format_result = SetPixelFormat (display_win32->dummy_context_wgl.hdc,
@@ -283,7 +269,7 @@ create_dummy_gl_window (void)
  ATOM klass;
  HWND hwnd = NULL;

-  wclass.lpszClassName = L"GdkGLDummyWindow";
+  wclass.lpszClassName = "GdkGLDummyWindow";
  wclass.lpfnWndProc = DefWindowProc;
  wclass.hInstance = this_module ();
  wclass.style = CS_OWNDC;
@@ -730,7 +730,7 @@ _gdk_win32_key_to_string (LONG lParam)
  char buf[100];
  char *keyname_utf8;

-  if (GetKeyNameTextA (lParam, buf, sizeof (buf)) &&
+  if (GetKeyNameText (lParam, buf, sizeof (buf)) &&
      (keyname_utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL)) != NULL)
    {
      char *retval = static_printf ("%s", keyname_utf8);
@@ -780,7 +780,7 @@ _gdk_win32_cf_to_string (UINT format)
      if (format >= CF_PRIVATEFIRST &&
 	  format <= CF_PRIVATELAST)
 	return static_printf ("CF_PRIVATE%d", format - CF_PRIVATEFIRST);
-      if (GetClipboardFormatNameA (format, buf, sizeof (buf)))
+      if (GetClipboardFormatName (format, buf, sizeof (buf)))
 	return static_printf ("'%s'", buf);
      else
 	return static_printf ("unk-%#lx", format);
@@ -197,7 +197,7 @@ typedef struct _Win32Cursor Win32Cursor;

 struct _Win32Cursor {
  GdkWin32CursorLoadType load_type;
-  wchar_t *resource_name;
+  gunichar2 *resource_name;
  int width;
  int height;
  guint load_flags;
@@ -326,7 +326,7 @@ RegisterGdkClass (GType wtype)
  static WNDCLASSEXW wcl;
  ATOM klass = 0;

-  wcl.cbSize = sizeof (WNDCLASSEXW);
+  wcl.cbSize = sizeof (WNDCLASSEX);
  wcl.style = 0; /* DON'T set CS_<H,V>REDRAW. It causes total redraw
                  * on WM_SIZE and WM_MOVE. Flicker, Performance!
                  */
@@ -340,7 +340,7 @@ RegisterGdkClass (GType wtype)
  /* initialize once! */
  if (0 == hAppIcon && 0 == hAppIconSm)
    {
-      wchar_t sLoc [MAX_PATH+1];
+      char sLoc [MAX_PATH+1];

      // try to load first icon of executable program
      if (0 != GetModuleFileName (NULL, sLoc, MAX_PATH))
@@ -2064,7 +2064,7 @@ stash_window (GdkSurface          *window,
  hmonitor = MonitorFromWindow (GDK_SURFACE_HWND (window), MONITOR_DEFAULTTONEAREST);
  hmonitor_info.cbSize = sizeof (hmonitor_info);

-  if (!GetMonitorInfo (hmonitor, &hmonitor_info))
+  if (!GetMonitorInfoA (hmonitor, &hmonitor_info))
    return;

  if (impl->snap_stash == NULL)
@@ -1,4 +1,4 @@
-static const struct { const char *name; const wchar_t *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; char *data; } cursors[] = {
+static const struct { const char *name; const char *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; char *data; } cursors[] = {
  { "X_cursor", NULL, 0, 16, 16, 7, 7, 
    "\125\000\000\125\152\100\001\251\152\220\006\251\152\244\032\251"
    "\032\251\152\244\006\252\252\220\001\252\252\100\000\152\251\000"
@@ -1776,6 +1776,11 @@ _gdk_x11_display_is_root_window (GdkDisplay *display,
  return GDK_SCREEN_XROOTWIN (display_x11->screen) == xroot_window;
 }

+struct XPointerUngrabInfo {
+  GdkDisplay *display;
+  guint32 time;
+};
+
 static void
 device_grab_update_callback (GdkDisplay *display,
                             gpointer    data,
@@ -127,7 +127,7 @@ gsk_gl_glyph_library_init_atlas (GskGLTextureLibrary *self,
  else
    {
      gl_format = GL_BGRA;
-      gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+      gl_type = GL_UNSIGNED_BYTE;
    }
  glBindTexture (GL_TEXTURE_2D, atlas->texture_id);

@@ -293,7 +293,7 @@ gsk_gl_glyph_library_upload_glyph (GskGLGlyphLibrary     *self,
    {
      pixel_data = cairo_image_surface_get_data (surface);
      gl_format = GL_BGRA;
-      gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+      gl_type = GL_UNSIGNED_BYTE;
    }

  glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / 4);
@@ -125,7 +125,7 @@ gsk_gl_icon_library_add (GskGLIconLibrary     *self,
    {
      pixel_data = surface_data;
      gl_format = GL_BGRA;
-      gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+      gl_type = GL_UNSIGNED_BYTE;
    }

  texture_id = GSK_GL_TEXTURE_ATLAS_ENTRY_TEXTURE (icon_data);
@@ -41,15 +41,6 @@
 #include <gsk/gskroundedrectprivate.h>
 #include <gsk/gskrectprivate.h>

-/**
- * GskGLRenderer:
- *
- * A GL based renderer.
- *
- * See [class@Gsk.Renderer].
- *
- * Since: 4.2
- */
 struct _GskGLRendererClass
 {
  GskRendererClass parent_class;
@@ -70,10 +70,7 @@ gsk_gl_frame_cleanup (GskGpuFrame *frame)
  if (self->sync)
    {
      glClientWaitSync (self->sync, 0, -1);
-
-      /* can't use g_clear_pointer() on glDeleteSync(), see MR !7294 */
-      glDeleteSync (self->sync);
-      self->sync = NULL;
+      g_clear_pointer (&self->sync, glDeleteSync);
    }

  self->next_texture_slot = 0;
@@ -249,13 +249,7 @@ gsk_gl_texture_data_free (gpointer user_data)

  gdk_gl_context_make_current (data->context);

-  /* can't use g_clear_pointer() on glDeleteSync(), see MR !7294 */
-  if (data->sync)
-    {
-      glDeleteSync (data->sync);
-      data->sync = NULL;
-    }
-
+  g_clear_pointer (&data->sync, glDeleteSync);
  glDeleteTextures (1, &data->texture_id);
  g_object_unref (data->context);

@@ -13,15 +13,6 @@

 #include <glib/gi18n-lib.h>

-/**
- * GskNglRenderer:
- *
- * A GL based renderer.
- *
- * See [class@Gsk.Renderer].
- *
- * Since: 4.2
- */
 struct _GskNglRenderer
 {
  GskGpuRenderer parent_instance;
@@ -81,7 +81,6 @@ struct _PipelineCacheKey
  GskGpuShaderClip clip;
  GskGpuBlend blend;
  VkFormat format;
-  VkPipeline pipeline;
 };

 struct _RenderPassCacheKey
@@ -89,7 +88,6 @@ struct _RenderPassCacheKey
  VkFormat format;
  VkImageLayout from_layout;
  VkImageLayout to_layout;
-  VkRenderPass render_pass;
 };

 static guint
@@ -299,10 +297,8 @@ gsk_vulkan_pipeline_layout_unref (GskVulkanDevice         *self,
  g_hash_table_iter_init (&iter, layout->pipeline_cache);
  while (g_hash_table_iter_next (&iter, &key, &value))
    {
-      vkDestroyPipeline (display->vk_device,
-                         ((PipelineCacheKey *)key)->pipeline,
-                         NULL);
      g_free (key);
+      vkDestroyPipeline (display->vk_device, value, NULL);
    }
  g_hash_table_unref (layout->pipeline_cache);

@@ -467,10 +463,8 @@ gsk_vulkan_device_finalize (GObject *object)
  g_hash_table_iter_init (&iter, self->render_pass_cache);
  while (g_hash_table_iter_next (&iter, &key, &value))
    {
-      vkDestroyRenderPass (display->vk_device,
-                           ((RenderPassCacheKey *)key)->render_pass,
-                           NULL);
      g_free (key);
+      vkDestroyRenderPass (display->vk_device, value, NULL);
    }
  g_hash_table_unref (self->render_pass_cache);

@@ -830,7 +824,6 @@ gsk_vulkan_device_get_vk_render_pass (GskVulkanDevice *self,
                                      VkImageLayout    to_layout)
 {
  RenderPassCacheKey cache_key;
-  RenderPassCacheKey *cached_result;
  VkRenderPass render_pass;
  GdkDisplay *display;

@@ -839,9 +832,9 @@ gsk_vulkan_device_get_vk_render_pass (GskVulkanDevice *self,
    .from_layout = from_layout,
    .to_layout = to_layout,
  };
-  cached_result = g_hash_table_lookup (self->render_pass_cache, &cache_key);
-  if (cached_result)
-    return cached_result->render_pass;
+  render_pass = g_hash_table_lookup (self->render_pass_cache, &cache_key);
+  if (render_pass)
+    return render_pass;

  display = gsk_gpu_device_get_display (GSK_GPU_DEVICE (self));

@@ -885,10 +878,7 @@ gsk_vulkan_device_get_vk_render_pass (GskVulkanDevice *self,
                                      NULL,
                                      &render_pass);

-  cached_result = g_memdup (&cache_key, sizeof (RenderPassCacheKey));
-  cached_result->render_pass = render_pass;
-
-  g_hash_table_insert (self->render_pass_cache, cached_result, cached_result);
+  g_hash_table_insert (self->render_pass_cache, g_memdup (&cache_key, sizeof (RenderPassCacheKey)), render_pass);

  return render_pass;
 }
@@ -956,7 +946,6 @@ gsk_vulkan_device_get_vk_pipeline (GskVulkanDevice           *self,
                                   VkRenderPass               render_pass)
 {
  PipelineCacheKey cache_key;
-  PipelineCacheKey *cached_result;
  VkPipeline pipeline;
  GdkDisplay *display;
  const char *version_string;
@@ -972,9 +961,9 @@ gsk_vulkan_device_get_vk_pipeline (GskVulkanDevice           *self,
    .blend = blend,
    .format = format,
  };
-  cached_result = g_hash_table_lookup (layout->pipeline_cache, &cache_key);
-  if (cached_result)
-    return cached_result->pipeline;
+  pipeline = g_hash_table_lookup (layout->pipeline_cache, &cache_key);
+  if (pipeline)
+    return pipeline;

  display = gsk_gpu_device_get_display (GSK_GPU_DEVICE (self));
  if (gsk_vulkan_device_has_feature (self, GDK_VULKAN_FEATURE_DYNAMIC_INDEXING) &&
@@ -1164,9 +1153,7 @@ gsk_vulkan_device_get_vk_pipeline (GskVulkanDevice           *self,
  g_free (fragment_shader_name);
  g_free (vertex_shader_name);

-  cached_result = g_memdup (&cache_key, sizeof (PipelineCacheKey));
-  cached_result->pipeline = pipeline;
-  g_hash_table_insert (layout->pipeline_cache, cached_result, cached_result);
+  g_hash_table_insert (layout->pipeline_cache, g_memdup (&cache_key, sizeof (PipelineCacheKey)), pipeline);
  gdk_display_vulkan_pipeline_cache_updated (display);

  return pipeline;
@@ -1274,7 +1261,7 @@ gsk_vulkan_device_find_allocator (GskVulkanDevice       *self,

  g_assert (found < properties.memoryTypeCount);

-  return gsk_vulkan_allocator_ref (gsk_vulkan_device_get_allocator (self, found, &properties.memoryTypes[found]));
+  return gsk_vulkan_allocator_ref (gsk_vulkan_device_get_allocator (self, i, &properties.memoryTypes[i]));
 }

 GskVulkanAllocator *
@@ -178,7 +178,7 @@ gsk_vulkan_buddy_allocator_alloc (GskVulkanAllocator  *allocator,
      if (self->cache.vk_memory)
        {
          *alloc = self->cache;
-          self->cache.vk_memory = VK_NULL_HANDLE;
+          self->cache.vk_memory = NULL;
        }
      else
        {
@@ -240,7 +240,7 @@ restart:
          alloc->size <<= 1;
          if (slot == 0)
            {
-              if (self->cache.vk_memory == VK_NULL_HANDLE)
+              if (self->cache.vk_memory == NULL)
                self->cache = *alloc;
              else
                gsk_vulkan_free (self->allocator, alloc);
@@ -439,7 +439,7 @@ gsk_gl_shader_class_init (GskGLShaderClass *klass)
  object_class->constructed = gsk_gl_shader_constructed;

  /**
-   * GskGLShader:source: (attributes org.gtk.Property.get=gsk_gl_shader_get_source)
+   * GskGLShader:sourcecode: (attributes org.gtk.Property.get=gsk_gl_shader_get_source)
   *
   * The source code for the shader, as a `GBytes`.
   */
@@ -387,7 +387,6 @@ gsk_path_builder_add_reverse_path (GskPathBuilder *self,
 /**
 * gsk_path_builder_add_cairo_path:
 * @self: a `GskPathBuilder`
- * @path: a path
 *
 * Adds a Cairo path to the builder.
 *
@@ -51,16 +51,6 @@ G_DEFINE_BOXED_TYPE (GskPathPoint, gsk_path_point,
                     gsk_path_point_copy,
                     gsk_path_point_free)

-/**
- * gsk_path_point_copy:
- * @point: a path point
- *
- * Copies a path point.
- *
- * Returns: the copied point
- *
- * Since: 4.14
- */
 GskPathPoint *
 gsk_path_point_copy (GskPathPoint *point)
 {
@@ -73,14 +63,6 @@ gsk_path_point_copy (GskPathPoint *point)
  return copy;
 }

-/**
- * gsk_path_point_free:
- * @point: a path point
- *
- * Frees a path point copied by [method@Gsk.PathPoint.copy].
- *
- * Since: 4.14
- */
 void
 gsk_path_point_free (GskPathPoint *point)
 {
@@ -679,16 +679,9 @@ vulkan_supported_platform (GdkSurface *surface,
  if (props.deviceType == VK_PHYSICAL_DEVICE_TYPE_CPU)
    {
      if (!as_fallback)
-        GSK_DEBUG (RENDERER, "Not using '%s': device is CPU", g_type_name (renderer_type));
-      return FALSE;
-    }
-
-  gdk_display_init_dmabuf (display);
-  if (!display->vk_dmabuf_formats ||
-      gdk_dmabuf_formats_get_n_formats (display->vk_dmabuf_formats) == 0)
-    {
-      if (!as_fallback)
-        GSK_DEBUG (RENDERER, "Not using '%s': no dmabuf support", g_type_name (renderer_type));
+        GSK_DEBUG (RENDERER,
+                   "Not using '%s': device is CPU",
+                   g_type_name (renderer_type));
      return FALSE;
    }

@@ -48,13 +48,6 @@

 #include <gobject/gvaluecollector.h>

-/**
- * gsk_serialization_error_quark:
- *
- * Registers an error quark for [class@Gsk.RenderNode] errors.
- *
- * Returns: the error quark
- **/
 G_DEFINE_QUARK (gsk-serialization-error-quark, gsk_serialization_error)

 #define GSK_RENDER_NODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSK_TYPE_RENDER_NODE, GskRenderNodeClass))
@@ -6397,10 +6397,6 @@ gsk_mask_node_draw (GskRenderNode *node,
  graphene_matrix_t color_matrix;
  graphene_vec4_t color_offset;

-  /* clip so the push_group() creates a smaller surface */
-  gsk_cairo_rectangle (cr, &node->bounds);
-  cairo_clip (cr);
-
  if (has_empty_clip (cr))
    return;

@@ -54,8 +54,6 @@
 #include <pango/pangofc-fontmap.h>
 #endif

-#include <hb-subset.h>
-
 #include <glib/gstdio.h>

 typedef struct _Context Context;
@@ -948,22 +946,23 @@ create_ascii_glyphs (PangoFont *font)
  PangoGlyphString *result, *glyph_string;
  guint i;

-  result = pango_glyph_string_new ();
-
  coverage = pango_font_get_coverage (font, language);
+  for (i = MIN_ASCII_GLYPH; i < MAX_ASCII_GLYPH; i++)
+    {
+      if (!pango_coverage_get (coverage, i))
+        break;
+    }
+  g_object_unref (coverage);
+  if (i < MAX_ASCII_GLYPH)
+    return NULL;

+  result = pango_glyph_string_new ();
  pango_glyph_string_set_size (result, N_ASCII_GLYPHS);
  glyph_string = pango_glyph_string_new ();
  for (i = MIN_ASCII_GLYPH; i < MAX_ASCII_GLYPH; i++)
    {
      const char text[2] = { i, 0 };

-      if (!pango_coverage_get (coverage, i))
-        {
-          result->glyphs[i - MIN_ASCII_GLYPH].glyph = PANGO_GLYPH_INVALID_INPUT;
-          continue;
-        }
-
      pango_shape_with_flags (text, 1,
                              text, 1,
                              &not_a_hack,
@@ -971,13 +970,14 @@ create_ascii_glyphs (PangoFont *font)
                              PANGO_SHAPE_NONE);

      if (glyph_string->num_glyphs != 1)
-        result->glyphs[i - MIN_ASCII_GLYPH].glyph = PANGO_GLYPH_INVALID_INPUT;
-      else
-        result->glyphs[i - MIN_ASCII_GLYPH] = glyph_string->glyphs[0];
+        {
+          pango_glyph_string_free (glyph_string);
+          pango_glyph_string_free (result);
+          return NULL;
+        }
+      result->glyphs[i - MIN_ASCII_GLYPH] = glyph_string->glyphs[0];
    }

-  g_object_unref (coverage);
-
  pango_glyph_string_free (glyph_string);

  return result;
@@ -1113,70 +1113,81 @@ parse_font (GtkCssParser *parser,
  if (font_name == NULL)
    return FALSE;

+  if (context->fontmap)
+    font = font_from_string (context->fontmap, font_name, FALSE);
+
  if (gtk_css_parser_has_url (parser))
    {
      char *url;
-      char *scheme;
-      GBytes *bytes;
-      GError *error = NULL;
-      GtkCssLocation start_location;
-      gboolean success = FALSE;

-      start_location = *gtk_css_parser_get_start_location (parser);
-      url = gtk_css_parser_consume_url (parser);
-
-      if (url != NULL)
+      if (font != NULL)
        {
-          scheme = g_uri_parse_scheme (url);
-          if (scheme && g_ascii_strcasecmp (scheme, "data") == 0)
-            {
-              bytes = gtk_css_data_url_parse (url, NULL, &error);
-            }
-          else
-            {
-              GFile *file;
-
-              file = g_file_new_for_uri (url);
-              bytes = g_file_load_bytes (file, NULL, NULL, &error);
-              g_object_unref (file);
-            }
-
-          g_free (scheme);
+          gtk_css_parser_error_value (parser, "A font with this name already exists.");
+          /* consume the url to avoid more errors */
+          url = gtk_css_parser_consume_url (parser);
          g_free (url);
-          if (bytes != NULL)
-            {
-              success = add_font_from_bytes (context, bytes, &error);
-              g_bytes_unref (bytes);
-            }
-
-          if (!success)
-            {
-              gtk_css_parser_emit_error (parser,
-                                         &start_location,
-                                         gtk_css_parser_get_end_location (parser),
-                                         error);
-            }
        }
-
-      if (success)
+      else
        {
-          font = font_from_string (context->fontmap, font_name, FALSE);
-          if (!font)
+          char *scheme;
+          GBytes *bytes;
+          GError *error = NULL;
+          GtkCssLocation start_location;
+          gboolean success = FALSE;
+
+          start_location = *gtk_css_parser_get_start_location (parser);
+          url = gtk_css_parser_consume_url (parser);
+
+          if (url != NULL)
            {
-              gtk_css_parser_error (parser,
-                                    GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE,
-                                    &start_location,
-                                    gtk_css_parser_get_end_location (parser),
-                                    "The given url does not define a font named \"%s\"",
-                                    font_name);
+              scheme = g_uri_parse_scheme (url);
+              if (scheme && g_ascii_strcasecmp (scheme, "data") == 0)
+                {
+                  bytes = gtk_css_data_url_parse (url, NULL, &error);
+                }
+              else
+                {
+                  GFile *file;
+
+                  file = g_file_new_for_uri (url);
+                  bytes = g_file_load_bytes (file, NULL, NULL, &error);
+                  g_object_unref (file);
+                }
+
+              g_free (scheme);
+              g_free (url);
+              if (bytes != NULL)
+                {
+                  success = add_font_from_bytes (context, bytes, &error);
+                  g_bytes_unref (bytes);
+                }
+
+              if (!success)
+                {
+                  gtk_css_parser_emit_error (parser,
+                                             &start_location,
+                                             gtk_css_parser_get_end_location (parser),
+                                             error);
+                }
+            }
+
+          if (success)
+            {
+              font = font_from_string (context->fontmap, font_name, FALSE);
+              if (!font)
+                {
+                  gtk_css_parser_error (parser,
+                                        GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE,
+                                        &start_location,
+                                        gtk_css_parser_get_end_location (parser),
+                                        "The given url does not define a font named \"%s\"",
+                                        font_name);
+                }
            }
        }
    }
  else
    {
-      if (context->fontmap)
-        font = font_from_string (context->fontmap, font_name, FALSE);
-
      if (!font)
        font = font_from_string (pango_cairo_font_map_get_default (), font_name, TRUE);

@@ -2244,12 +2255,6 @@ unpack_glyphs (PangoFont        *font,
                return FALSE;
            }

-          if (ascii->glyphs[idx].glyph == PANGO_GLYPH_INVALID_INPUT)
-            {
-              g_clear_pointer (&ascii, pango_glyph_string_free);
-              return FALSE;
-            }
-
          gi->glyph = ascii->glyphs[idx].glyph;
          gi->geometry.width = ascii->glyphs[idx].geometry.width;
        }
@@ -2941,7 +2946,7 @@ typedef struct
  gsize named_node_counter;
  GHashTable *named_textures;
  gsize named_texture_counter;
-  GHashTable *fonts;
+  GHashTable *serialized_fonts;
 } Printer;

 static void
@@ -2956,59 +2961,6 @@ printer_init_check_texture (Printer    *printer,
    g_hash_table_insert (printer->named_textures, texture, g_strdup (""));
 }

-typedef struct {
-  hb_face_t *face;
-  hb_subset_input_t *input;
-  gboolean serialized;
-} FontInfo;
-
-static void
-font_info_free (gpointer data)
-{
-  FontInfo *info = (FontInfo *) data;
-
-  hb_face_destroy (info->face);
-  if (info->input)
-    hb_subset_input_destroy (info->input);
-  g_free (info);
-}
-
-static void
-printer_init_collect_font_info (Printer       *printer,
-                                GskRenderNode *node)
-{
-  PangoFont *font;
-  FontInfo *info;
-
-  font = gsk_text_node_get_font (node);
-
-  info = (FontInfo *) g_hash_table_lookup (printer->fonts, hb_font_get_face (pango_font_get_hb_font (font)));
-  if (!info)
-    {
-      info = g_new0 (FontInfo, 1);
-
-      info->face = hb_face_reference (hb_font_get_face (pango_font_get_hb_font (font)));
-      if (!g_object_get_data (G_OBJECT (pango_font_get_font_map (font)), "font-files"))
-        {
-          info->input = hb_subset_input_create_or_fail ();
-          hb_subset_input_set_flags (info->input, HB_SUBSET_FLAGS_RETAIN_GIDS);
-        }
-
-      g_hash_table_insert (printer->fonts, info->face, info);
-    }
-
-  if (info->input)
-    {
-      const PangoGlyphInfo *glyphs;
-      guint n_glyphs;
-
-      glyphs = gsk_text_node_get_glyphs (node, &n_glyphs);
-
-      for (guint i = 0; i < n_glyphs; i++)
-        hb_set_add (hb_subset_input_glyph_set (info->input), glyphs[i].glyph);
-    }
-}
-
 static void
 printer_init_duplicates_for_node (Printer       *printer,
                                  GskRenderNode *node)
@@ -3024,9 +2976,6 @@ printer_init_duplicates_for_node (Printer       *printer,
    {
    case GSK_CAIRO_NODE:
    case GSK_TEXT_NODE:
-      printer_init_collect_font_info (printer, node);
-      break;
-
    case GSK_COLOR_NODE:
    case GSK_LINEAR_GRADIENT_NODE:
    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
@@ -3150,7 +3099,7 @@ printer_init (Printer       *self,
  self->named_node_counter = 0;
  self->named_textures = g_hash_table_new_full (NULL, NULL, NULL, g_free);
  self->named_texture_counter = 0;
-  self->fonts = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, font_info_free);
+  self->serialized_fonts = g_hash_table_new (g_str_hash, g_str_equal);

  printer_init_duplicates_for_node (self, node);
 }
@@ -3162,7 +3111,7 @@ printer_clear (Printer *self)
    g_string_free (self->str, TRUE);
  g_hash_table_unref (self->named_nodes);
  g_hash_table_unref (self->named_textures);
-  g_hash_table_unref (self->fonts);
+  g_hash_table_unref (self->serialized_fonts);
 }

 #define IDENT_LEVEL 2 /* Spaces per level */
@@ -3283,6 +3232,17 @@ append_rounded_rect (GString              *str,
    }
 }

+static void
+append_rgba (GString       *str,
+             const GdkRGBA *rgba)
+{
+  char *rgba_str = gdk_rgba_to_string (rgba);
+
+  g_string_append (str, rgba_str);
+
+  g_free (rgba_str);
+}
+
 static void
 append_point (GString                *str,
              const graphene_point_t *p)
@@ -3328,7 +3288,7 @@ append_rgba_param (Printer       *p,
 {
  _indent (p);
  g_string_append_printf (p->str, "%s: ", param_name);
-  gdk_rgba_print (value, p->str);
+  append_rgba (p->str, value);
  g_string_append_c (p->str, ';');
  g_string_append_c (p->str, '\n');
 }
@@ -3482,7 +3442,7 @@ append_stops_param (Printer            *p,

      string_append_double (p->str, stops[i].offset);
      g_string_append_c (p->str, ' ');
-      gdk_rgba_print (&stops[i].color, p->str);
+      append_rgba (p->str, &stops[i].color);
    }
  g_string_append (p->str, ";\n");
 }
@@ -3622,46 +3582,14 @@ append_texture_param (Printer    *p,
  g_bytes_unref (bytes);
 }

-static void
-print_font (PangoFont *font)
-{
-  PangoFontDescription *desc;
-  char *s;
-  hb_face_t *face;
-  hb_blob_t *blob;
-  const char *data;
-  unsigned int length;
-  char *csum;
-
-  desc = pango_font_describe_with_absolute_size (font);
-  s = pango_font_description_to_string (desc);
-
-  face = hb_font_get_face (pango_font_get_hb_font (font));
-  blob = hb_face_reference_blob (face);
-
-  data = hb_blob_get_data (blob, &length);
-  csum = g_compute_checksum_for_data (G_CHECKSUM_SHA256, (const guchar *)data, length);
-
-  g_print ("%s, face %p, sha %s\n", s, face, csum);
-
-  g_free (csum);
-  hb_blob_destroy (blob);
-  g_free (s);
-}
-
 static void
 gsk_text_node_serialize_font (GskRenderNode *node,
                              Printer       *p)
 {
  PangoFont *font = gsk_text_node_get_font (node);
+  PangoFontMap *fontmap = pango_font_get_font_map (font);
  PangoFontDescription *desc;
  char *s;
-  FontInfo *info;
-  hb_face_t *face;
-  hb_blob_t *blob;
-  const char *data;
-  guint length;
-  char *b64;

  desc = pango_font_describe_with_absolute_size (font);
  s = pango_font_description_to_string (desc);
@@ -3669,31 +3597,42 @@ gsk_text_node_serialize_font (GskRenderNode *node,
  g_free (s);
  pango_font_description_free (desc);

-  g_print ("serializing ");
-  print_font (font);
-  info = g_hash_table_lookup (p->fonts, hb_font_get_face (pango_font_get_hb_font (font)));
-  if (info->serialized)
+  /* Check if this is  a custom font that we created from a url */
+  if (!g_object_get_data (G_OBJECT (fontmap), "font-files"))
    return;

-  if (info->input)
-    face = hb_subset_or_fail (info->face, info->input);
-  else
-    face = hb_face_reference (info->face);
+#ifdef HAVE_PANGOFT
+  {
+    FcPattern *pat;
+    FcResult res;
+    const char *file;
+    char *data;
+    gsize len;
+    char *b64;

-  blob = hb_face_reference_blob (face);
-  data = hb_blob_get_data (blob, &length);
+    pat = pango_fc_font_get_pattern (PANGO_FC_FONT (font));
+    res = FcPatternGetString (pat, FC_FILE, 0, (FcChar8 **)&file);
+    if (res != FcResultMatch)
+      return;

-  b64 = base64_encode_with_linebreaks ((const guchar *) data, length);
+    if (g_hash_table_contains (p->serialized_fonts, file))
+      return;

-  g_string_append (p->str, " url(\"data:font/ttf;base64,\\\n");
-  append_escaping_newlines (p->str, b64);
-  g_string_append (p->str, "\")");
+    if (!g_file_get_contents (file, &data, &len, NULL))
+      return;

-  g_free (b64);
-  hb_blob_destroy (blob);
-  hb_face_destroy (face);
+    g_hash_table_add (p->serialized_fonts, (gpointer) file);

-  info->serialized = TRUE;
+    b64 = base64_encode_with_linebreaks ((const guchar *) data, len);
+
+    g_string_append (p->str, " url(\"data:font/ttf;base64,\\\n");
+    append_escaping_newlines (p->str, b64);
+    g_string_append (p->str, "\")");
+
+    g_free (b64);
+    g_free (data);
+  }
+#endif
 }

 static void
@@ -4129,7 +4068,7 @@ render_node_print (Printer       *p,
              {
                if (i > 0)
                  g_string_append_c (p->str, ' ');
-                gdk_rgba_print (&colors[i], p->str);
+                append_rgba (p->str, &colors[i]);
              }
            g_string_append (p->str, ";\n");
          }
@@ -354,8 +354,6 @@ gsk_stroke_set_miter_limit (GskStroke  *self,
 *
 * Returns the miter limit of a `GskStroke`.
 *
- * Returns: the miter limit
- *
 * Since: 4.14
 */
 float
@@ -480,8 +478,6 @@ gsk_stroke_set_dash_offset (GskStroke *self,
 *
 * Returns the dash_offset of a `GskStroke`.
 *
- * Returns: the dash_offset
- *
 * Since: 4.14
 */
 float
@@ -2023,7 +2023,7 @@ GskTransformCategory
  return self->category;
 }

-/**
+/*
 * gsk_transform_new: (constructor):
 *
 * Creates a new identity transform.
@@ -530,15 +530,6 @@ handle_accessible_method (GDBusConnection       *connection,
      g_variant_builder_open (&builder, G_VARIANT_TYPE ("a{ss}"));
      g_variant_builder_add (&builder, "{ss}", "toolkit", "GTK");

-      if (gtk_at_context_has_accessible_property (GTK_AT_CONTEXT (self), GTK_ACCESSIBLE_PROPERTY_LEVEL))
-        {
-          GtkAccessibleValue *value = gtk_at_context_get_accessible_property (GTK_AT_CONTEXT (self),
-                                                                              GTK_ACCESSIBLE_PROPERTY_LEVEL);
-          char *level = g_strdup_printf ("%d", gtk_int_accessible_value_get (value));
-          g_variant_builder_add (&builder, "{ss}", "level", level);
-          g_free (level);
-        }
-
      if (gtk_at_context_has_accessible_property (GTK_AT_CONTEXT (self), GTK_ACCESSIBLE_PROPERTY_PLACEHOLDER))
        {
          GtkAccessibleValue *value;
@@ -1266,13 +1257,10 @@ gtk_at_spi_context_child_change (GtkATContext             *ctx,
    }

  if (change & GTK_ACCESSIBLE_CHILD_CHANGE_ADDED)
-  {
-    gtk_at_context_realize (child_context);
    emit_children_changed (self,
                           GTK_AT_SPI_CONTEXT (child_context),
                           idx,
                           GTK_ACCESSIBLE_CHILD_STATE_ADDED);
-  }
  else if (change & GTK_ACCESSIBLE_CHILD_CHANGE_REMOVED)
    emit_children_changed (self,
                           GTK_AT_SPI_CONTEXT (child_context),
@@ -21,26 +21,12 @@

 #include "gtkcsserror.h"

-/**
- * gtk_css_parser_error_quark:
- *
- * Registers an error quark for CSS parsing errors.
- *
- * Returns: the error quark
- **/
 GQuark
 gtk_css_parser_error_quark (void)
 {
  return g_quark_from_static_string ("gtk-css-parser-error-quark");
 }

-/**
- * gtk_css_parser_warning_quark:
- *
- * Registers an error quark for CSS parsing warnings.
- *
- * Returns: the warning quark
- **/
 GQuark
 gtk_css_parser_warning_quark (void)
 {
@@ -27,11 +27,6 @@ G_BEGIN_DECLS

 typedef struct _GtkCssLocation GtkCssLocation;

-/**
- * GtkCssLocation:
- *
- * A description of a location inside a CSS stream.
- */
 struct _GtkCssLocation
 {
  gsize                  bytes;
@@ -26,10 +26,6 @@
 #include "gtkcsserror.h"
 #include "gtkcsslocationprivate.h"

-/* We cannot include gtkdebug.h, so we must keep this in sync */
-extern unsigned int gtk_get_debug_flags (void);
-#define DEBUG_CHECK_CSS ((gtk_get_debug_flags () & GTK_CSS_PARSER_DEBUG_CSS) != 0)
-
 static void clear_ref (GtkCssVariableValueReference *ref);

 #define GDK_ARRAY_NAME gtk_css_parser_references
@@ -53,7 +49,7 @@ struct _GtkCssParserBlock
 #define GDK_ARRAY_NAME gtk_css_parser_blocks
 #define GDK_ARRAY_TYPE_NAME GtkCssParserBlocks
 #define GDK_ARRAY_ELEMENT_TYPE GtkCssParserBlock
-#define GDK_ARRAY_PREALLOC 12
+#define GDK_ARRAY_PREALLOC 32
 #define GDK_ARRAY_NO_MEMSET 1
 #include "gdk/gdkarrayimpl.c"

@@ -630,7 +626,7 @@ void
 gtk_css_parser_skip (GtkCssParser *self)
 {
  const GtkCssToken *token;
-
+  
  token = gtk_css_parser_get_token (self);
  if (gtk_css_token_is_preserved (token, NULL))
    {
@@ -663,7 +659,7 @@ gtk_css_parser_skip_until (GtkCssParser    *self,
                           GtkCssTokenType  token_type)
 {
  const GtkCssToken *token;
-
+  
  for (token = gtk_css_parser_get_token (self);
       !gtk_css_token_is (token, token_type) &&
       !gtk_css_token_is (token, GTK_CSS_TOKEN_EOF);
@@ -816,29 +812,6 @@ gtk_css_parser_warn_syntax (GtkCssParser *self,
  va_end (args);
 }

-void
-gtk_css_parser_warn_deprecated (GtkCssParser *self,
-                                 const char   *format,
-                                 ...)
-{
-  if (DEBUG_CHECK_CSS)
-    {
-      va_list args;
-      GError *error;
-
-      va_start (args, format);
-      error = g_error_new_valist (GTK_CSS_PARSER_WARNING,
-                                  GTK_CSS_PARSER_WARNING_DEPRECATED,
-                                  format, args);
-      gtk_css_parser_emit_error (self,
-                                 gtk_css_parser_get_start_location (self),
-                                 gtk_css_parser_get_end_location (self),
-                                 error);
-      g_error_free (error);
-      va_end (args);
-    }
-}
-
 gboolean
 gtk_css_parser_consume_function (GtkCssParser *self,
                                 guint         min_args,
@@ -1160,7 +1133,7 @@ gtk_css_parser_parse_url_arg (GtkCssParser *parser,
  *out_url = gtk_css_parser_consume_string (parser);
  if (*out_url == NULL)
    return 0;
-
+  
  return 1;
 }

@@ -1206,7 +1179,7 @@ gtk_css_parser_consume_url (GtkCssParser *self)
      gtk_css_parser_error_syntax (self, "Expected a URL");
      return NULL;
    }
-
+  
  return url;
 }

@@ -1327,9 +1300,6 @@ gtk_css_parser_has_references (GtkCssParser *self)
  gboolean ret = FALSE;
  int inner_blocks = 0, i;

-  /* We don't want gtk_css_parser_ensure_token to expand references on us here */
-  g_assert (self->n_refs == 0);
-
  gtk_css_tokenizer_save (tokenizer);

  do {
@@ -1345,7 +1315,7 @@ gtk_css_parser_has_references (GtkCssParser *self)
          if (gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_PARENS) ||
              gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_SQUARE))
            {
-              goto done;
+              goto error;
            }
        }

@@ -1368,7 +1338,7 @@ gtk_css_parser_has_references (GtkCssParser *self)
          inner_blocks++;
          gtk_css_parser_start_block (self);

-          if (is_var)
+          if (!ret && is_var)
            {
              token = gtk_css_parser_get_token (self);

@@ -1376,18 +1346,18 @@ gtk_css_parser_has_references (GtkCssParser *self)
                {
                  const char *var_name = gtk_css_token_get_string (token);

-                  if (strlen (var_name) < 3 || var_name[0] != '-' || var_name[1] != '-')
-                    goto done;
+                  if (var_name[0] != '-' || var_name[1] != '-')
+                    goto error;

                  gtk_css_parser_consume_token (self);

                  if (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_EOF) &&
                      !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_COMMA))
-                    goto done;
+                    {
+                      goto error;
+                    }

                  ret = TRUE;
-                  /* We got our answer. Now get it out as fast as possible! */
-                  goto done;
                }
            }
        }
@@ -1395,7 +1365,18 @@ gtk_css_parser_has_references (GtkCssParser *self)
  while (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_SEMICOLON) &&
         !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_CLOSE_CURLY));

-done:
+  if (inner_blocks > 0)
+    goto error;
+
+  g_assert (tokenizer == get_tokenizer (self));
+
+  gtk_css_tokenizer_restore (tokenizer);
+  self->location = *gtk_css_tokenizer_get_location (tokenizer);
+  gtk_css_tokenizer_read_token (tokenizer, &self->token, NULL);
+
+  return ret;
+
+error:
  for (i = 0; i < inner_blocks; i++)
    gtk_css_parser_end_block (self);

@@ -1405,7 +1386,7 @@ done:
  self->location = *gtk_css_tokenizer_get_location (tokenizer);
  gtk_css_tokenizer_read_token (tokenizer, &self->token, NULL);

-  return ret;
+  return FALSE;
 }

 static void
@@ -1501,9 +1482,9 @@ gtk_css_parser_parse_value_into_token_stream (GtkCssParser *self)
                  GtkCssVariableValueReference ref;
                  char *var_name = g_strdup (gtk_css_token_get_string (token));

-                  if (strlen (var_name) < 3 || var_name[0] != '-' || var_name[1] != '-')
+                  if (var_name[0] != '-' || var_name[1] != '-')
                    {
-                      gtk_css_parser_error_syntax (self, "Invalid variable name: %s", var_name);
+                      gtk_css_parser_error_value (self, "Invalid variable name: %s", var_name);
                      g_free (var_name);
                      goto error;
                    }
@@ -1546,20 +1527,6 @@ gtk_css_parser_parse_value_into_token_stream (GtkCssParser *self)

                  gtk_css_parser_references_append (&refs, &ref);
                }
-              else
-                {
-                  if (gtk_css_token_is (token, GTK_CSS_TOKEN_EOF))
-                    {
-                      gtk_css_parser_error_syntax (self, "Missing variable name");
-                    }
-                  else
-                    {
-                      char *s = gtk_css_token_to_string (token);
-                      gtk_css_parser_error_syntax (self, "Expected a variable name, not %s", s);
-                      g_free (s);
-                    }
-                  goto error;
-                }
            }
        }
    }
@@ -120,9 +120,6 @@ void                    gtk_css_parser_warn                     (GtkCssParser
 void                    gtk_css_parser_warn_syntax              (GtkCssParser                   *self,
                                                                 const char                     *format,
                                                                 ...) G_GNUC_PRINTF(2, 3);
-void                    gtk_css_parser_warn_deprecated          (GtkCssParser                   *self,
-                                                                 const char                     *format,
-                                                                 ...) G_GNUC_PRINTF(2, 3);


 gboolean                gtk_css_parser_has_token                (GtkCssParser                   *self,
@@ -172,9 +169,5 @@ void                    gtk_css_parser_get_expanding_variables (GtkCssParser
                                                                char                    ***names,
                                                                gsize                     *n_variables);

-
-/* We cannot include gtkdebug.h, so we must keep this in sync */
-#define GTK_CSS_PARSER_DEBUG_CSS (1 << 20)
-
 G_END_DECLS

@@ -53,21 +53,6 @@ gtk_css_section_new (GFile                *file,
  return gtk_css_section_new_with_bytes (file, NULL,start, end);
 }

-/**
- * gtk_css_section_new_with_bytes: (constructor)
- * @file: (nullable) (transfer none): The file this section refers to
- * @bytes: (nullable) (transfer none): The bytes this sections refers to
- * @start: The start location
- * @end: The end location
- *
- * Creates a new `GtkCssSection` referring to the section
- * in the given `file` or the given `bytes` from the `start` location to the
- * `end` location.
- *
- * Returns: (transfer full): a new `GtkCssSection`
- *
- * Since: 4.16
- **/
 GtkCssSection *
 gtk_css_section_new_with_bytes (GFile  *file,
                                GBytes *bytes,
@@ -180,17 +165,6 @@ gtk_css_section_get_file (const GtkCssSection *section)
  return section->file;
 }

-/**
- * gtk_css_section_get_bytes:
- * @section: the section
- *
- * Gets the bytes that @section was parsed from.
- *
- * Returns: (transfer none) (nullable): the `GBytes` from which the `section`
- *   was parsed
- *
- * Since: 4.16
- **/
 GBytes *
 gtk_css_section_get_bytes (const GtkCssSection *section)
 {
@@ -268,7 +242,7 @@ gtk_css_section_print (const GtkCssSection  *section,
      g_string_append (string, "<data>");
    }

-  g_string_append_printf (string, ":%zu:%zu",
+  g_string_append_printf (string, ":%zu:%zu", 
                          section->start_location.lines + 1,
                          section->start_location.line_chars + 1);
  if (section->start_location.lines != section->end_location.lines ||
@@ -689,11 +689,6 @@ gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *klass)
                                    PROP_ORIENTATION,
                                    "orientation");

-  /**
-   * GtkCellRendererProgress:inverted:
-   *
-   * Whether progess is inverted.
-   */
  g_object_class_install_property (object_class,
                                   PROP_INVERTED,
                                   g_param_spec_boolean ("inverted", NULL, NULL,
@@ -175,8 +175,7 @@ gtk_cell_renderer_spinner_class_init (GtkCellRendererSpinnerClass *klass)
  cell_class->get_preferred_height = gtk_cell_renderer_spinner_get_preferred_height;
  cell_class->snapshot = gtk_cell_renderer_spinner_snapshot;

-  /**
-   * GtkCellRendererSpinner:active:
+  /* GtkCellRendererSpinner:active:
   *
   * Whether the spinner is active (ie. shown) in the cell
   */
@@ -254,7 +253,7 @@ gtk_cell_renderer_spinner_update_size (GtkCellRendererSpinner *cell,
  node = gtk_style_context_get_node (context);
  gtk_icon_size_set_style_classes (node, priv->icon_size);
  style = gtk_css_node_get_style (node);
-  priv->size = gtk_css_number_value_get (style->icon->icon_size, 100);
+  priv->size = _gtk_css_number_value_get (style->icon->icon_size, 100);

  gtk_style_context_restore (context);
 }
@@ -370,7 +370,7 @@ static int
 calc_indicator_size (GtkStyleContext *context)
 {
  GtkCssStyle *style = gtk_style_context_lookup_style (context);
-  return gtk_css_number_value_get (style->icon->icon_size, 100);
+  return _gtk_css_number_value_get (style->icon->icon_size, 100);
 }

 static void
@@ -512,8 +512,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
   * This is an [keybinding signal](class.SignalAction.html).
   *
   * The default bindings for this signal are Alt+Up and Escape.
-   *
-   * Returns: whether the combo box was popped down
   */
  combo_box_signals[POPDOWN] =
    g_signal_new_class_handler (I_("popdown"),
@@ -297,21 +297,11 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                  NULL,
                  G_TYPE_NONE, 0);

-  /**
-   * GtkEntryCompletion:model:
-   *
-   * The model used as data source.
-   */
  entry_completion_props[PROP_MODEL] =
      g_param_spec_object ("model", NULL, NULL,
                           GTK_TYPE_TREE_MODEL,
                           GTK_PARAM_READWRITE);

-  /**
-   * GtkEntryCompletion:minimum-key-length:
-   *
-   * The minimum key length as set for completion.
-   */
  entry_completion_props[PROP_MINIMUM_KEY_LENGTH] =
      g_param_spec_int ("minimum-key-length", NULL, NULL,
                        0, G_MAXINT, 1,
@@ -410,11 +410,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
 						     -1, G_MAXINT, -1,
 						     GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));

-  /**
-   * GtkIconView:model:
-   *
-   * The model of the icon view.
-   */
  g_object_class_install_property (gobject_class,
                                   PROP_MODEL,
                                   g_param_spec_object ("model", NULL, NULL,
@@ -521,12 +516,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
 							 FALSE,
 							 G_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));

-    /**
-     * GtkIconView:tooltip-column:
-     *
-     * The column of the icon view model which is being used for displaying
-     * tooltips on it's rows.
-     */
    g_object_class_install_property (gobject_class,
                                     PROP_TOOLTIP_COLUMN,
                                     g_param_spec_int ("tooltip-column", NULL, NULL,
@@ -723,8 +712,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
   * programmatically.
   *
   * The default bindings for this signal are Space, Return and Enter.
-   *
-   * Returns: whether the item was activated
   */
  icon_view_signals[ACTIVATE_CURSOR_ITEM] =
    g_signal_new (I_("activate-cursor-item"),
@@ -760,8 +747,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
   * - PageUp/PageDown which move by "pages"
   * All of these will extend the selection when combined with
   * the Shift modifier.
-   *
-   * Returns: whether the cursor was moved
   */
  icon_view_signals[MOVE_CURSOR] =
    g_signal_new (I_("move-cursor"),
@@ -62,7 +62,7 @@ struct _GtkMessageDialog
 *
 * > Please note that %GTK_BUTTONS_OK, %GTK_BUTTONS_YES_NO
 * > and %GTK_BUTTONS_OK_CANCEL are discouraged by the
- * > [GNOME Human Interface Guidelines](https://developer.gnome.org/hig/).
+ * > [GNOME Human Interface Guidelines](http://library.gnome.org/devel/hig-book/stable/).
 */
 typedef enum
 {
@@ -99,6 +99,7 @@ window_handle_exported (GtkWindow  *window,
 * a given uri.
 *
 * The @callback will be called when the launch is completed.
+ * It should call gtk_show_uri_full_finish() to obtain the result.
 *
 * This is the recommended call to be used as it passes information
 * necessary for sandbox helpers to parent their dialogs properly.
@@ -152,8 +153,8 @@ gtk_show_uri_full (GtkWindow           *parent,
 * Returns: %TRUE if the URI was shown successfully.
 *   Otherwise, %FALSE is returned and @error is set
 *
- * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch] or
- *   [method@Gtk.UriLauncher.launch] instead
+ * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch_finish] or
+ *   [method@Gtk.UriLauncher.launch_finish] instead
 */
 gboolean
 gtk_show_uri_full_finish (GtkWindow     *parent,
@@ -122,11 +122,6 @@ gtk_style_context_class_init (GtkStyleContextClass *klass)
  object_class->set_property = gtk_style_context_impl_set_property;
  object_class->get_property = gtk_style_context_impl_get_property;

-  /**
-   * GtkStyleContext:display:
-   *
-   * The display of the style context.
-   */
  properties[PROP_DISPLAY] =
      g_param_spec_object ("display", NULL, NULL,
                           GDK_TYPE_DISPLAY,
@@ -778,27 +773,20 @@ gtk_style_context_resolve_color (GtkStyleContext    *context,
 {
  GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context);
  GtkCssValue *val;
-  GtkCssComputeContext ctx = { NULL, };

  g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), FALSE);
  g_return_val_if_fail (color != NULL, FALSE);
  g_return_val_if_fail (result != NULL, FALSE);

-  ctx.provider = GTK_STYLE_PROVIDER (priv->cascade);
-  ctx.style = gtk_css_node_get_style (priv->cssnode);
-  if (gtk_css_node_get_parent (priv->cssnode))
-    ctx.parent_style = gtk_css_node_get_style (gtk_css_node_get_parent (priv->cssnode));
-
-  val = gtk_css_color_value_resolve (color,
-                                     GTK_CSS_PROPERTY_COLOR,
-                                     &ctx,
-                                     _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR));
-
+  val = _gtk_css_color_value_resolve (color,
+                                      GTK_STYLE_PROVIDER (priv->cascade),
+                                      _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR),
+                                      NULL);
  if (val == NULL)
    return FALSE;

  *result = *gtk_css_color_value_get_rgba (val);
-  gtk_css_value_unref (val);
+  _gtk_css_value_unref (val);
  return TRUE;
 }

@@ -872,10 +860,10 @@ gtk_style_context_get_border (GtkStyleContext *context,

  style = gtk_style_context_lookup_style (context);

-  border->top = round (gtk_css_number_value_get (style->border->border_top_width, 100));
-  border->right = round (gtk_css_number_value_get (style->border->border_right_width, 100));
-  border->bottom = round (gtk_css_number_value_get (style->border->border_bottom_width, 100));
-  border->left = round (gtk_css_number_value_get (style->border->border_left_width, 100));
+  border->top = round (_gtk_css_number_value_get (style->border->border_top_width, 100));
+  border->right = round (_gtk_css_number_value_get (style->border->border_right_width, 100));
+  border->bottom = round (_gtk_css_number_value_get (style->border->border_bottom_width, 100));
+  border->left = round (_gtk_css_number_value_get (style->border->border_left_width, 100));
 }

 /**
@@ -898,10 +886,10 @@ gtk_style_context_get_padding (GtkStyleContext *context,

  style = gtk_style_context_lookup_style (context);

-  padding->top = round (gtk_css_number_value_get (style->size->padding_top, 100));
-  padding->right = round (gtk_css_number_value_get (style->size->padding_right, 100));
-  padding->bottom = round (gtk_css_number_value_get (style->size->padding_bottom, 100));
-  padding->left = round (gtk_css_number_value_get (style->size->padding_left, 100));
+  padding->top = round (_gtk_css_number_value_get (style->size->padding_top, 100));
+  padding->right = round (_gtk_css_number_value_get (style->size->padding_right, 100));
+  padding->bottom = round (_gtk_css_number_value_get (style->size->padding_bottom, 100));
+  padding->left = round (_gtk_css_number_value_get (style->size->padding_left, 100));
 }

 /**
@@ -924,10 +912,10 @@ gtk_style_context_get_margin (GtkStyleContext *context,

  style = gtk_style_context_lookup_style (context);

-  margin->top = round (gtk_css_number_value_get (style->size->margin_top, 100));
-  margin->right = round (gtk_css_number_value_get (style->size->margin_right, 100));
-  margin->bottom = round (gtk_css_number_value_get (style->size->margin_bottom, 100));
-  margin->left = round (gtk_css_number_value_get (style->size->margin_left, 100));
+  margin->top = round (_gtk_css_number_value_get (style->size->margin_top, 100));
+  margin->right = round (_gtk_css_number_value_get (style->size->margin_right, 100));
+  margin->bottom = round (_gtk_css_number_value_get (style->size->margin_bottom, 100));
+  margin->left = round (_gtk_css_number_value_get (style->size->margin_left, 100));
 }

 void
@@ -527,22 +527,12 @@ gtk_tree_model_filter_class_init (GtkTreeModelFilterClass *filter_class)
  filter_class->visible = gtk_tree_model_filter_real_visible;
  filter_class->modify  = gtk_tree_model_filter_real_modify;

-  /**
-   * GtkTreeModelFilter:child-model:
-   *
-   * The child model of the tree model filter.
-   */
  g_object_class_install_property (object_class,
                                   PROP_CHILD_MODEL,
                                   g_param_spec_object ("child-model", NULL, NULL,
                                                        GTK_TYPE_TREE_MODEL,
                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));

-  /**
-   * GtkTreeModelFilter:virtual-root:
-   *
-   * The virtual root of the tree model filter.
-   */
  g_object_class_install_property (object_class,
                                   PROP_VIRTUAL_ROOT,
                                   g_param_spec_boxed ("virtual-root", NULL, NULL,
@@ -479,12 +479,6 @@ gtk_tree_model_sort_class_init (GtkTreeModelSortClass *class)
  object_class->finalize = gtk_tree_model_sort_finalize;

  /* Properties */
-
-  /**
-   * GtkTreeModelSort:model:
-   *
-   * The model of the tree model sort.
-   */
  g_object_class_install_property (object_class,
                                   PROP_MODEL,
                                   g_param_spec_object ("model", NULL, NULL,
@@ -2691,8 +2691,8 @@ gtk_tree_view_get_expander_size (GtkTreeView *tree_view)
  gtk_style_context_add_class (context, "expander");

  style = gtk_style_context_lookup_style (context);
-  min_width = gtk_css_number_value_get (style->size->min_width, 100);
-  min_height = gtk_css_number_value_get (style->size->min_height, 100);
+  min_width = _gtk_css_number_value_get (style->size->min_width, 100);
+  min_height = _gtk_css_number_value_get (style->size->min_height, 100);

  gtk_style_context_restore (context);

@@ -5521,7 +5521,7 @@ get_separator_height (GtkTreeView *tree_view)
  gtk_style_context_add_class (context, "separator");

  style = gtk_style_context_lookup_style (context);
-  d = gtk_css_number_value_get (style->size->min_height, 100);
+  d = _gtk_css_number_value_get (style->size->min_height, 100);

  if (d < 1)
    min_size = ceil (d);
@@ -1129,7 +1129,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
 }

 /**
- * gtk_about_dialog_get_comments: (attributes org.gtk.Method.get_property=comments)
+ * gtk_about_dialog_get_comments: (attributes org.gtk.Method.set_property=comments)
 * @about: a `GtkAboutDialog`
 *
 * Returns the comments string.
@@ -505,8 +505,6 @@ out:
 *
 * If the parse operation fails, @accelerator_key and @accelerator_mods will
 * be set to 0 (zero).
- *
- * Returns: whether parsing succeeded
 */
 gboolean
 gtk_accelerator_parse (const char      *accelerator,
@@ -56,21 +56,10 @@ G_DEFINE_INTERFACE (GtkActionable, gtk_actionable, GTK_TYPE_WIDGET)
 static void
 gtk_actionable_default_init (GtkActionableInterface *iface)
 {
-
-  /**
-   * GtkActionable:action-name:
-   *
-   * The name of the action with which this widget should be associated.
-   */
  g_object_interface_install_property (iface,
    g_param_spec_string ("action-name", NULL, NULL,
                         NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));

-  /**
-   * GtkActionable:action-target:
-   *
-   * The target value of the actionable widget's action.
-   */
  g_object_interface_install_property (iface,
    g_param_spec_variant ("action-target", NULL, NULL,
                          G_VARIANT_TYPE_ANY, NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
@@ -33,7 +33,8 @@
 * are needed to present a message to the user.
 *
 * The message is shown with the [method@Gtk.AlertDialog.choose]
- * function.
+ * function. This API follows the GIO async pattern, and the result can
+ * be obtained by calling [method@Gtk.AlertDialog.choose_finish].
 *
 * If you don't need to wait for a button to be clicked, you can use
 * [method@Gtk.AlertDialog.show].
@@ -686,6 +687,10 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 *
 * This function shows the alert to the user.
 *
+ * The @callback will be called when the alert is dismissed.
+ * It should call [method@Gtk.AlertDialog.choose_finish]
+ * to obtain the result.
+ *
 * It is ok to pass `NULL` for the callback if the alert
 * does not have more than one button. A simpler API for
 * this case is [method@Gtk.AlertDialog.show].
@@ -76,19 +76,13 @@ G_DEFINE_TYPE (GtkApplicationImplQuartz, gtk_application_impl_quartz, GTK_TYPE_A

 -(NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication *)sender
 {
-  const gchar *quit_action_name = "quit";
-  GActionGroup *action_group = G_ACTION_GROUP (quartz->impl.application);
-
-  if (quartz->quit_inhibit != 0)
-    return NSTerminateCancel;
-
-  if (g_action_group_has_action (action_group, quit_action_name))
-    {
-      g_action_group_activate_action (action_group, quit_action_name, NULL);
-      return NSTerminateCancel;
-    }
-
-  return NSTerminateNow;
+  /* We have no way to give our message other than to pop up a dialog
+   * ourselves, which we should not do since the OS will already show
+   * one when we return NSTerminateNow.
+   *
+   * Just let the OS show the generic message...
+   */
+  return quartz->quit_inhibit == 0 ? NSTerminateNow : NSTerminateCancel;
 }

 -(void)application:(NSApplication *)theApplication openFiles:(NSArray *)filenames
@@ -2953,13 +2953,6 @@ gtk_builder_get_type_from_name (GtkBuilder  *builder,
  return type;
 }

-/**
- * gtk_builder_error_quark:
- *
- * Registers an error quark for [class@Gtk.Builder] errors.
- *
- * Returns: the error quark
- **/
 GQuark
 gtk_builder_error_quark (void)
 {
@@ -434,10 +434,11 @@ gtk_builder_cscope_new (void)

 /**
 * gtk_builder_cscope_add_callback:
- * @scope: a `GtkBuilderCScope`
- * @callback: (scope async): The callback pointer
+ * @self: a `GtkBuilderCScope`
+ * @callback_symbols: (scope async): The callback pointer
 *
- * Adds the @callback to the scope of @builder under its own name.
+ * Adds the @callback_symbol to the scope of @builder under its
+ * own name.
 *
 * This is a convenience wrapper of [method@Gtk.BuilderCScope.add_callback_symbol].
 *
@@ -84,7 +84,7 @@ gtk_builtin_icon_measure (GtkWidget      *widget,

  style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));

-  *minimum = *natural = gtk_css_number_value_get (style->icon->icon_size, 100);
+  *minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100);
 }

 static void
@@ -232,14 +232,6 @@ gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class)

  g_object_class_override_property (object_class, PROP_RGBA, "rgba");
  g_object_class_override_property (object_class, PROP_USE_ALPHA, "use-alpha");
-
-  /**
-   * GtkColorChooserDialog:show-editor:
-   *
-   * Whether the color chooser dialog is showing the single-color editor.
-   *
-   * It can be set to switch the color chooser into single-color editing mode.
-   */
  g_object_class_install_property (object_class, PROP_SHOW_EDITOR,
      g_param_spec_boolean ("show-editor", NULL, NULL,
                            FALSE, GTK_PARAM_READWRITE));
@@ -36,7 +36,9 @@
 * should be modal.
 *
 * The dialog is shown with the [method@Gtk.ColorDialog.choose_rgba]
- * function.
+ * function. This API follows the GIO async pattern, and the
+ * result can be obtained by calling
+ * [method@Gtk.ColorDialog.choose_rgba_finish].
 *
 * See [class@Gtk.ColorDialogButton] for a convenient control
 * that uses `GtkColorDialog` and presents the results.
@@ -434,6 +436,10 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 * This function initiates a color choice operation by
 * presenting a color chooser dialog to the user.
 *
+ * The @callback will be called when the dialog is dismissed.
+ * It should call [method@Gtk.ColorDialog.choose_rgba_finish]
+ * to obtain the result.
+ *
 * Since: 4.10
 */
 void
@@ -32,9 +32,7 @@
 #include <math.h>
 #include <string.h>

-#include "gtkcolorutilsprivate.h"
-#include "gdkhslaprivate.h"
-#include <math.h>
+#include "gtkcolorutils.h"

 /* Converts from RGB to HSV */
 static void
@@ -228,198 +226,3 @@ gtk_rgb_to_hsv (float  r, float  g, float  b,
  if (v)
    *v = b;
 }
-
-void
-gtk_rgb_to_hsl (float  red, float  green,      float  blue,
-                float *hue, float *saturation, float *lightness)
-{
-  GdkHSLA hsla;
-
-  _gdk_hsla_init_from_rgba (&hsla, &(GdkRGBA) { red, green, blue, 1.0 });
-
-  *hue = hsla.hue;
-  *saturation = hsla.saturation;
-  *lightness = hsla.lightness;
-}
-
-void
-gtk_hsl_to_rgb (float  hue, float  saturation, float  lightness,
-                float *red, float *green,      float *blue)
-{
-  GdkRGBA rgba;
-
-  _gdk_rgba_init_from_hsla (&rgba, &(GdkHSLA) { hue, saturation, lightness, 1.0 });
-
-  *red = rgba.red;
-  *green = rgba.green;
-  *blue = rgba.blue;
-}
-
-void
-gtk_rgb_to_hwb (float  red, float  green, float blue,
-                float *hue, float *white, float *black)
-{
-  GdkRGBA rgba = (GdkRGBA) { red, green, blue, 1 };
-  GdkHSLA hsla;
-
-  _gdk_hsla_init_from_rgba (&hsla, &rgba);
-
-  *hue = hsla.hue;
-  *white = MIN (MIN (red, green), blue);
-  *black = (1 - MAX (MAX (red, green), blue));
-}
-
-void
-gtk_hwb_to_rgb (float  hue, float  white, float  black,
-                float *red, float *green, float *blue)
-{
-  GdkHSLA hsla;
-  GdkRGBA rgba;
-
-  if (white + black >= 1)
-    {
-      float gray = white / (white + black);
-
-      *red = gray;
-      *green = gray;
-      *blue = gray;
-
-      return;
-    }
-
-  hsla.hue = hue;
-  hsla.saturation = 1.0;
-  hsla.lightness = 0.5;
-
-  _gdk_rgba_init_from_hsla (&rgba, &hsla);
-
-  *red = rgba.red * (1 - white - black) + white;
-  *green = rgba.green * (1 - white - black) + white;
-  *blue = rgba.blue * (1 - white - black) + white;
-}
-
-#define DEG_TO_RAD(x) ((x) * G_PI / 180)
-#define RAD_TO_DEG(x) ((x) * 180 / G_PI)
-
-static inline void
-_sincosf (float  angle,
-          float *out_s,
-          float *out_c)
-{
-#ifdef HAVE_SINCOSF
-  sincosf (angle, out_s, out_c);
-#else
-  *out_s = sinf (angle);
-  *out_c = cosf (angle);
-#endif
-}
-
-void
-gtk_oklab_to_oklch (float  L,  float  a, float  b,
-                    float *L2, float *C, float *H)
-{
-  *L2 = L;
-  *C = hypotf (a, b);
-  *H = RAD_TO_DEG (atan2 (b, a));
-  *H = fmod (*H, 360);
-  if (*H < 0)
-    *H += 360;
-}
-
-void
-gtk_oklch_to_oklab (float  L,  float  C, float  H,
-                    float *L2, float *a, float *b)
-{
-  *L2 = L;
-  _sincosf (DEG_TO_RAD (H), b, a);
-  *a *= C;
-  *b *= C;
-}
-
-static float
-apply_gamma (float v)
-{
-  if (v > 0.0031308)
-    return 1.055 * pow (v, 1/2.4) - 0.055;
-  else
-    return 12.92 * v;
-}
-
-static float
-unapply_gamma (float v)
-{
-  if (v >= 0.04045)
-    return pow (((v + 0.055)/(1 + 0.055)), 2.4);
-  else
-    return v / 12.92;
-}
-
-void
-gtk_oklab_to_linear_srgb (float  L,   float  a,     float  b,
-                          float *red, float *green, float *blue)
-{
-  float l = L + 0.3963377774f * a + 0.2158037573f * b;
-  float m = L - 0.1055613458f * a - 0.0638541728f * b;
-  float s = L - 0.0894841775f * a - 1.2914855480f * b;
-
-  l = powf (l, 3);
-  m = powf (m, 3);
-  s = powf (s, 3);
-
-  *red = +4.0767416621f * l - 3.3077115913f * m + 0.2309699292f * s;
-  *green = -1.2684380046f * l + 2.6097574011f * m - 0.3413193965f * s;
-  *blue = -0.0041960863f * l - 0.7034186147f * m + 1.7076147010f * s;
-}
-
-void
-gtk_oklab_to_rgb (float  L,   float  a,     float  b,
-                  float *red, float *green, float *blue)
-{
-  float linear_red, linear_green, linear_blue;
-  gtk_oklab_to_linear_srgb (L, a, b, &linear_red, &linear_green, &linear_blue);
-  gtk_linear_srgb_to_rgb (linear_red, linear_green, linear_blue, red, green, blue);
-}
-
-void
-gtk_linear_srgb_to_oklab (float  red, float  green, float  blue,
-                          float *L,   float *a,     float *b)
-{
-  float l = 0.4122214708f * red + 0.5363325363f * green + 0.0514459929f * blue;
-  float m = 0.2119034982f * red + 0.6806995451f * green + 0.1073969566f * blue;
-  float s = 0.0883024619f * red + 0.2817188376f * green + 0.6299787005f * blue;
-
-  l = cbrtf (l);
-  m = cbrtf (m);
-  s = cbrtf (s);
-
-  *L = 0.2104542553f*l + 0.7936177850f*m - 0.0040720468f*s;
-  *a = 1.9779984951f*l - 2.4285922050f*m + 0.4505937099f*s;
-  *b = 0.0259040371f*l + 0.7827717662f*m - 0.8086757660f*s;
-}
-
-void
-gtk_rgb_to_oklab (float  red, float  green, float  blue,
-                  float *L,   float *a,     float *b)
-{
-  float linear_red, linear_green, linear_blue;
-  gtk_rgb_to_linear_srgb (red, green, blue, &linear_red, &linear_green, &linear_blue);
-  gtk_linear_srgb_to_oklab (linear_red, linear_green, linear_blue, L, a, b);
-}
-
-void
-gtk_rgb_to_linear_srgb (float  red,        float  green,        float  blue,
-                        float *linear_red, float *linear_green, float *linear_blue)
-{
-  *linear_red = unapply_gamma (red);
-  *linear_green = unapply_gamma (green);
-  *linear_blue = unapply_gamma (blue);
-}
-
-void
-gtk_linear_srgb_to_rgb (float  linear_red, float  linear_green, float  linear_blue,
-                        float *red,        float *green,        float *blue)
-{
-  *red = apply_gamma (linear_red);
-  *green = apply_gamma (linear_green);
-  *blue = apply_gamma (linear_blue);
-}
@@ -1,55 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2024 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 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 "gtkcolorutils.h"
-
-G_BEGIN_DECLS
-
-void gtk_rgb_to_hsl (float  red, float  green,      float  blue,
-                     float *hue, float *saturation, float *lightness);
-void gtk_hsl_to_rgb (float  hue, float  saturation, float  lightness,
-                     float *red, float *green,      float *blue);
-
-void gtk_rgb_to_hwb (float  red, float  green, float  blue,
-                     float *hue, float *white, float *black);
-void gtk_hwb_to_rgb (float  hue, float  white, float  black,
-                     float *red, float *green, float *blue);
-
-void gtk_oklab_to_oklch (float  L,  float  a, float  b,
-                         float *L2, float *C, float *H);
-void gtk_oklch_to_oklab (float  L,  float  C, float  H,
-                         float *L2, float *a, float *b);
-
-void gtk_oklab_to_linear_srgb (float  L,   float  a,     float  b,
-                               float *red, float *green, float *blue);
-void gtk_linear_srgb_to_oklab (float  red, float  green, float  blue,
-                               float *L,   float *a,     float *b);
-
-void gtk_oklab_to_rgb (float  L,   float  a,     float  b,
-                       float *red, float *green, float *blue);
-void gtk_rgb_to_oklab (float  red, float  green, float  blue,
-                       float *L,   float *a,     float *b);
-
-void gtk_rgb_to_linear_srgb (float  red,        float  green,        float  blue,
-                             float *linear_red, float *linear_green, float *linear_blue);
-void gtk_linear_srgb_to_rgb (float  linear_red, float  linear_green, float  linear_blue,
-                             float *red,        float *green,        float *blue);
-
-
-G_END_DECLS
@@ -2188,8 +2188,7 @@ gtk_column_view_set_header_factory (GtkColumnView      *self,
 /**
 * gtk_column_view_scroll_to:
 * @self: The columnview to scroll in
- * @pos: position of the item. Must be less than the number of
- *   items in the view.
+ * @pos: position of the item
 * @column: (nullable) (transfer none): The column to scroll to
 *   or %NULL to not scroll columns.
 * @flags: actions to perform
@@ -2212,7 +2211,6 @@ gtk_column_view_scroll_to (GtkColumnView       *self,
                           GtkScrollInfo       *scroll)
 {
  g_return_if_fail (GTK_IS_COLUMN_VIEW (self));
-  g_return_if_fail (pos < gtk_list_base_get_n_items (GTK_LIST_BASE (self->listview)));
  g_return_if_fail (column == NULL || GTK_IS_COLUMN_VIEW_COLUMN (column));
  if (column)
    {
@@ -1924,13 +1924,6 @@ attribute_from_name (const char *name)
  return GTK_CONSTRAINT_ATTRIBUTE_NONE;
 }

-/**
- * gtk_constraint_vfl_parser_error_quark:
- *
- * Registers an error quark for VFL error parsing.
- *
- * Returns: the error quark
- **/
 GQuark
 gtk_constraint_vfl_parser_error_quark (void)
 {
@@ -42,37 +42,9 @@

 G_DEFINE_TYPE (GtkCssAnimatedStyle, gtk_css_animated_style, GTK_TYPE_CSS_STYLE)

-static inline gboolean
-property_has_color (guint id)
-{
-  switch (id)
-    {
-    case GTK_CSS_PROPERTY_COLOR:
-    case GTK_CSS_PROPERTY_ICON_PALETTE:
-    case GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR:
-    case GTK_CSS_PROPERTY_TEXT_SHADOW:
-    case GTK_CSS_PROPERTY_BOX_SHADOW:
-    case GTK_CSS_PROPERTY_BORDER_TOP_COLOR:
-    case GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR:
-    case GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR:
-    case GTK_CSS_PROPERTY_BORDER_LEFT_COLOR:
-    case GTK_CSS_PROPERTY_OUTLINE_COLOR:
-    case GTK_CSS_PROPERTY_BACKGROUND_IMAGE:
-    case GTK_CSS_PROPERTY_ICON_SOURCE:
-    case GTK_CSS_PROPERTY_ICON_SHADOW:
-    case GTK_CSS_PROPERTY_CARET_COLOR:
-    case GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR:
-      return TRUE;
-    default:
-       return FALSE;
-    }
-}
-
 #define DEFINE_VALUES(ENUM, TYPE, NAME) \
 static inline void \
-gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle   *animated, \
-                                       GtkCssComputeContext  *context, \
-                                       GtkCssAnimationChange  change) \
+gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle *animated) \
 { \
  GtkCssStyle *style = (GtkCssStyle *)animated; \
  GtkCssValue **values = (GtkCssValue **)((guint8*)(animated->style->NAME) + sizeof (GtkCssValues)); \
@@ -82,7 +54,6 @@ gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle   *animated, \
    { \
      guint id = NAME ## _props[i]; \
      GtkCssValue *original, *computed; \
-      gboolean needs_recompute = FALSE; \
 \
      if (values[i] == NULL) \
        continue; \
@@ -91,27 +62,16 @@ gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle   *animated, \
      if (original == NULL) \
        continue; \
 \
-      if ((change & GTK_CSS_ANIMATION_CHANGE_VARIABLES) && \
-           gtk_css_value_contains_variables (original)) \
-        needs_recompute = TRUE; \
-\
-      if ((change & GTK_CSS_ANIMATION_CHANGE_COLOR) && \
-          property_has_color (id)) \
-        needs_recompute = TRUE; \
-\
-      if (!needs_recompute) \
-        continue; \
-\
-      computed = gtk_css_value_compute (original, \
-                                        id, \
-                                        context); \
+      computed = _gtk_css_value_compute (original, \
+                                         id, \
+                                         animated->provider, \
+                                         style, \
+                                         animated->parent_style, \
+                                         NULL); \
      if (computed == NULL) \
        continue; \
 \
      gtk_css_animated_style_set_animated_value (animated, id, computed); \
-\
-      if (id == GTK_CSS_PROPERTY_COLOR) \
-        change |= GTK_CSS_ANIMATION_CHANGE_COLOR; \
    } \
 }

@@ -645,20 +605,15 @@ gtk_css_animated_style_get_intrinsic_value (GtkCssAnimatedStyle *style,
  return gtk_css_style_get_value (style->style, id);
 }

-gboolean
+void
 gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,
                                                  int                  id,
                                                  GtkCssVariableValue *value)
 {
  GtkCssStyle *style = (GtkCssStyle *)animated;
-  GtkCssVariableValue *old_value;

-  gtk_internal_return_val_if_fail (GTK_IS_CSS_ANIMATED_STYLE (style), FALSE);
-  gtk_internal_return_val_if_fail (value != NULL, FALSE);
-
-  old_value = gtk_css_style_get_custom_property (style, id);
-  if (gtk_css_variable_value_equal (old_value, value))
-    return FALSE;
+  gtk_internal_return_if_fail (GTK_IS_CSS_ANIMATED_STYLE (style));
+  gtk_internal_return_if_fail (value != NULL);

  if (style->variables == NULL)
    {
@@ -675,38 +630,17 @@ gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,

  gtk_css_variable_set_add (style->variables, id, value);

-  return TRUE;
-}
-
-void
-gtk_css_animated_style_recompute (GtkCssAnimatedStyle   *style,
-                                  GtkCssAnimationChange  change)
-{
-  GtkCssComputeContext context = { NULL, };
-  GtkCssValue *shorthands[GTK_CSS_SHORTHAND_PROPERTY_N_PROPERTIES] = { NULL, };
-
-  context.provider = style->provider;
-  context.style = style->style;
-  context.parent_style = style->parent_style;
-  context.shorthands = shorthands;
-
-  gtk_css_core_values_recompute (style, &context, change);
-  gtk_css_background_values_recompute (style, &context, change);
-  gtk_css_border_values_recompute (style, &context, change);
-  gtk_css_icon_values_recompute (style, &context, change);
-  gtk_css_outline_values_recompute (style, &context, change);
-  gtk_css_font_values_recompute (style, &context, change);
-  gtk_css_font_variant_values_recompute (style, &context, change);
-  gtk_css_animation_values_recompute (style, &context, change);
-  gtk_css_transition_values_recompute (style, &context, change);
-  gtk_css_size_values_recompute (style, &context, change);
-  gtk_css_other_values_recompute (style, &context, change);
-
-  for (unsigned int i = 0; i < GTK_CSS_SHORTHAND_PROPERTY_N_PROPERTIES; i++)
-    {
-      if (shorthands[i])
-        gtk_css_value_unref (shorthands[i]);
-    }
+  gtk_css_core_values_recompute (animated);
+  gtk_css_background_values_recompute (animated);
+  gtk_css_border_values_recompute (animated);
+  gtk_css_icon_values_recompute (animated);
+  gtk_css_outline_values_recompute (animated);
+  gtk_css_font_values_recompute (animated);
+  gtk_css_font_variant_values_recompute (animated);
+  gtk_css_animation_values_recompute (animated);
+  gtk_css_transition_values_recompute (animated);
+  gtk_css_size_values_recompute (animated);
+  gtk_css_other_values_recompute (animated);
 }

 GtkCssVariableValue *
@@ -855,8 +789,8 @@ gtk_css_animated_style_create_css_transitions (GPtrArray   *animations,

  if (_gtk_css_array_value_get_n_values (durations) == 1 &&
      _gtk_css_array_value_get_n_values (delays) == 1 &&
-      gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, 0), 100) +
-      gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, 0), 100) == 0)
+      _gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, 0), 100) +
+      _gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, 0), 100) == 0)
    return animations;

  transition_infos_set (transitions, base_style->transition->transition_property);
@@ -871,8 +805,8 @@ gtk_css_animated_style_create_css_transitions (GPtrArray   *animations,
      if (!transitions[i].pending)
        continue;

-      duration = gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, transitions[i].index), 100);
-      delay = gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, transitions[i].index), 100);
+      duration = _gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, transitions[i].index), 100);
+      delay = _gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, transitions[i].index), 100);
      if (duration + delay == 0.0)
        continue;

@@ -881,7 +815,7 @@ gtk_css_animated_style_create_css_transitions (GPtrArray   *animations,
          start = gtk_css_animated_style_get_intrinsic_value ((GtkCssAnimatedStyle *)source, i);
          end = gtk_css_style_get_value (base_style, i);

-          if (gtk_css_value_equal (start, end))
+          if (_gtk_css_value_equal (start, end))
            {
              animation = gtk_css_animated_style_find_transition ((GtkCssAnimatedStyle *)source, i);
              if (animation)
@@ -897,8 +831,8 @@ gtk_css_animated_style_create_css_transitions (GPtrArray   *animations,
            }
        }

-      if (gtk_css_value_equal (gtk_css_style_get_value (source, i),
-                               gtk_css_style_get_value (base_style, i)))
+      if (_gtk_css_value_equal (gtk_css_style_get_value (source, i),
+                                gtk_css_style_get_value (base_style, i)))
        continue;

      animation = _gtk_css_transition_new (i,
@@ -1004,13 +938,13 @@ gtk_css_animated_style_create_css_animations (GPtrArray        *animations,
          animation = _gtk_css_animation_new (name,
                                              keyframes,
                                              timestamp,
-                                              gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, i), 100) * G_USEC_PER_SEC,
-                                              gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, i), 100) * G_USEC_PER_SEC,
+                                              _gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, i), 100) * G_USEC_PER_SEC,
+                                              _gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, i), 100) * G_USEC_PER_SEC,
                                              _gtk_css_array_value_get_nth (timing_functions, i),
                                              _gtk_css_direction_value_get (_gtk_css_array_value_get_nth (directions, i)),
                                              _gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)),
                                              _gtk_css_fill_mode_value_get (_gtk_css_array_value_get_nth (fill_modes, i)),
-                                              gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100));
+                                              _gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100));
        }

      if (!animations)
@@ -70,17 +70,9 @@ void                    gtk_css_animated_style_set_animated_value(GtkCssAnimated
 GtkCssValue *           gtk_css_animated_style_get_intrinsic_value (GtkCssAnimatedStyle *style,
                                                                 guint                   id);

-gboolean                gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,
+void                    gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,
                                                                 int                     id,
                                                                 GtkCssVariableValue    *value);
-
-typedef enum {
-  GTK_CSS_ANIMATION_CHANGE_VARIABLES = 1 << 0,
-  GTK_CSS_ANIMATION_CHANGE_COLOR     = 1 << 1,
-} GtkCssAnimationChange;
-
-void                    gtk_css_animated_style_recompute        (GtkCssAnimatedStyle    *style,
-                                                                 GtkCssAnimationChange   change);
 GtkCssVariableValue *   gtk_css_animated_style_get_intrinsic_custom_value (GtkCssAnimatedStyle *style,
                                                                 int                     id);

@@ -95,7 +95,6 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
  GtkCssKeyframes *resolved_keyframes;
  double progress;
  guint i;
-  GtkCssAnimationChange change = 0;

  if (!gtk_css_animation_is_executing (animation))
    return;
@@ -126,8 +125,7 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
      if (!value)
        continue;

-      if (gtk_css_animated_style_set_animated_custom_value (style, variable_id, value))
-        change |= GTK_CSS_ANIMATION_CHANGE_VARIABLES;
+      gtk_css_animated_style_set_animated_custom_value (style, variable_id, value);

      gtk_css_variable_value_unref (value);
    }
@@ -136,7 +134,7 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
    {
      GtkCssValue *value;
      guint property_id;
-
+      
      property_id = _gtk_css_keyframes_get_property_id (resolved_keyframes, i);

      value = _gtk_css_keyframes_get_value (resolved_keyframes,
@@ -144,14 +142,8 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
                                            progress,
                                            gtk_css_animated_style_get_intrinsic_value (style, property_id));
      gtk_css_animated_style_set_animated_value (style, property_id, value);
-
-      if (property_id == GTK_CSS_PROPERTY_COLOR)
-        change |= GTK_CSS_ANIMATION_CHANGE_COLOR;
    }

-  if (change != 0)
-    gtk_css_animated_style_recompute (style, change);
-
  _gtk_css_keyframes_unref (resolved_keyframes);
 }

@@ -179,7 +171,7 @@ gtk_css_animation_free (GtkStyleAnimation *animation)

  g_free (self->name);
  _gtk_css_keyframes_unref (self->keyframes);
-  gtk_css_value_unref (self->ease);
+  _gtk_css_value_unref (self->ease);

  g_free (self);
 }
@@ -219,7 +211,7 @@ _gtk_css_animation_new (const char      *name,

  animation->name = g_strdup (name);
  animation->keyframes = _gtk_css_keyframes_ref (keyframes);
-  animation->ease = gtk_css_value_ref (ease);
+  animation->ease = _gtk_css_value_ref (ease);
  animation->direction = direction;
  animation->play_state = play_state;
  animation->fill_mode = fill_mode;
@@ -250,7 +242,7 @@ _gtk_css_animation_advance_with_play_state (GtkCssAnimation *source,

  animation->name = g_strdup (source->name);
  animation->keyframes = _gtk_css_keyframes_ref (source->keyframes);
-  animation->ease = gtk_css_value_ref (source->ease);
+  animation->ease = _gtk_css_value_ref (source->ease);
  animation->direction = source->direction;
  animation->play_state = play_state;
  animation->fill_mode = source->fill_mode;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	e5d0f32d8c	css: Improve error reporting for variables Emit errors for all the variables that were being expanded if an error occurs while parsing a property value at compute time. Include the variables that are being expanded in the error message.	2024-05-09 23:13:53 -04:00
Matthias Clasen	e825fd901f	css parser: Keep variables for tokenizers Add a function that gets the names of the variables that the parser is currently in the process of expanding. This will be used for error reporting.	2024-05-09 23:13:53 -04:00
Matthias Clasen	e3543f37d3	css parser: Inline the tokenizer array This is in preparation of associating more data with the token streams.	2024-05-09 23:13:53 -04:00
Matthias Clasen	e9bf0322ac	css provider: Set bytes on sections Pass the bytes we're parsing to the sections, and keep a pointer to them around, so we can compare them in the has_section implementation. This commit also corrects some of the location information that we add into the section for variables to be more accurate.	2024-05-09 23:13:53 -04:00
Matthias Clasen	6d5cb0a083	css parser: Add gtk_css_parser_get_bytes Gets the bytes that the parser is operating on.	2024-05-09 23:13:53 -04:00
Matthias Clasen	8b5aab459a	css provider: Set sections on all variable values We were doing it in one case, but forgetting it in another. These sections are necessary to report meaningful error locations when parsing property values at compute time.	2024-05-09 23:13:53 -04:00
Matthias Clasen	8da3cc10fd	style cascade: Propagate errors When we compute values, the provider we use ends up being the style cascade. If we hit a parser error when parsing variable-bearing property values at compute time, we emit the error on that provider. By making the cascade propagate the error back to the proper css provider that contains the section in question, we get it reported back to the css editor in the inspector.	2024-05-09 23:13:53 -04:00
Matthias Clasen	f48a4e84af	style provider: Add a has_section api Add gtk_style_provider_has_section and implement it for GtkCssProvider. This will be used later to direct error emissions to the right provider.	2024-05-09 23:13:53 -04:00
Matthias Clasen	09c76208a2	css parser: Add bytes to sections We will use this later to link sections back to the providers they come from.	2024-05-09 23:13:53 -04:00
Matthias Clasen	62b1d21556	css parser: Add gtk_css_parser_skip_whitespace Does what it says.	2024-05-09 23:13:53 -04:00
Matthias Clasen	8fba58eaa9	css: Don't accept junk Check that there is no junk at the end of the property value when parsing variable-bearing properties at compute time.	2024-05-09 23:13:52 -04:00
Alice Mikhaylenko	b4890edd64	inspector: Sort GTK CSS properties between standard and custom ones	2024-05-08 19:03:45 +04:00
Alice Mikhaylenko	93b9388180	inspector: Show custom properties for css nodes	2024-05-08 19:03:45 +04:00
Alice Mikhaylenko	76b2609ad5	testsuite: Add css variables tests	2024-05-08 19:03:44 +04:00
Alice Mikhaylenko	a37a0711ad	csskeyframes: Support variables	2024-05-08 19:03:44 +04:00
Alice Mikhaylenko	23dbb7122c	cssanimation: Recompute values while playing This will be necessary for supporting variables in animations. For this we need to pass all the gtk_css_value_compute() parameters into GtkCssAnimatedStyle: parent style and provider.	2024-05-08 19:03:44 +04:00
Alice Mikhaylenko	e04ab263f9	cssstaticstyle: Split property lists into a separate header We'll need to use them in GtkCssAnimatedStyle too.	2024-05-08 19:03:44 +04:00
Alice Mikhaylenko	5e6e808a55	cssvalue: Pass an extra GtkCssVariableSet to compute() We'll need this to support variables in @keyframes, since styles will need to combine their own variables and the ones from the keyframes. See the next commit, this one is split out to avoid a huge diff.	2024-05-08 19:03:44 +04:00
Alice Mikhaylenko	6eaf6e2f7d	Implement basic support for CSS variables	2024-05-08 19:03:43 +04:00
Alice Mikhaylenko	e4a4a0f6dd	cssvalue: Add contains_variables() We'll need this to know which values to recompute for animations. It will be used in the next commit, it's separate to avoid the diff being too large.	2024-05-08 19:00:40 +04:00
Alice Mikhaylenko	f301ea7936	csstokenizer: Add save() and restore() We'll need that to check if property values contain variables.	2024-05-08 19:00:40 +04:00
Alice Mikhaylenko	a3e9ecd199	cssprovider: Copy bytes when loading We'll need to keep accessing them later to compute values with variables, so we can't avoid this anymore.	2024-05-08 19:00:40 +04:00