textview: Don't validate during snapshot

Do it during size_allocate, and go back there if needed.
widget: Warn for invalidation during paint
2023-02-21 15:04:30 -05:00 · 2023-02-21 15:04:30 -05:00 · 2023-02-21 15:04:30 -05:00
253 changed files with 27000 additions and 29258 deletions
@@ -20,7 +20,6 @@ flatpak build ${builddir} meson \
                -Dx11-backend=true \
                -Dwayland-backend=true \
                -Dbuild-tests=false \
-                -Dbuild-testsuite=false \
                -Dbuild-examples=false \
                -Dintrospection=disabled \
                -Ddemos=true \
@@ -1,158 +1,5 @@
-Overview of Changes in 4.10.3, 22-04-2023
-=========================================
-
-* Fix a popover positioning regression in 4.10.2
-
-* Fix issues with slow loading files in the file chooser
-
-
-Overview of Changes in 4.10.2, 21-04-2023
-=========================================
-
-* Fixed issues:
- - Holding control to select multiple files broken in filechooser (#5669)
- - Inspector crash (#5681)
- - Listbase doesn't account for bottom padding in size_allocate_child (#5380)
- - Leaking AT contexts (#5690)
- - OpenGL / Windows: Crash when closing gtk4-widget-factory (#5685)
- - GTK apps crash on startup when setting cursor-size to 0 on Wayland (#5700)
- - Segmentation fault: gdk_wayland_toplevel_set_startup_id() needs to null-check
-   display->xdg_activation before using it (#5701)
- - Possible use-after-free under gtk_scrolled_window_update_use_indicators() (#5684)
- - Wrong error message in `gtk_init` (#5704)
- - Segfault when scrolling after changing ListView model (#5763)
- - Bluetooth panel from the Settings app: clicking in the "Downloads" link
-   no longer opens Nautilus (#5671)
- - Broadway docs or code is broken (#5662)
- - Disabled GtkPicture's are not properly themed (#5683)
- - Setting CSS padding to a GtkTextView gives the context menu an offset (#5695)
- - A11y: the Showing state is used only for windows (#5194)
- - Gtk4 expander: CSS nodes mismatch code vs. documentation (#5723)
- - Invoking gtk inspector on a folder results in a crash (#5729)
- - Double tap requires very precise touch input (#5580)
- - Name autocompletion dropdown in the GTK4 FileChooser's Save dialog gets
-   stuck, creates artifacts, jumps around (#5743)
- - Links are not opened when xdg-desktop-portal OpenURI is not available (#5733)
- - GtkSnapshot generates no nodes appending whitespace-only layouts (#5747)
-
-* Translation updates
- British English
- Bulgarian
- Chinese (China)
- French
- Indonesian
- Korean
- Russian
- Serbian
- Slovenian
- Turkish
-
-
-Overview of Changes in 4.10.1, 14-03-2023
-=========================================
-
-* GtkFileChooser
- - Improve search performance
- - Be safe against pathless files
- - Fix memory leaks
- - Only show local files in recent files
- - Show most recent files first
- - Make files non-selectable in selet_folder mode
-
-* GtkListView / GtkColumnView / GtkGridView
- - Fix scrolling problems
- - Support CSS border-spacing
-
-* GtkComboBox
- - Fix a size allocation problem
-
-* gtk
- - Size allocation fixes
-
-* Accessibility
- - Miscellaneous property fixes and improvements
-
-* Wayland
- - Fix an ordering problem in surface disposal
-
-* Windows
- - Fix Visual Studio build with older GLib
-
-* Translation updates
- Basque
- Bulgarian
- Catalan
- Czech
- Danish
- Finnish
- Friulian
- Galician
- Georgian
- Hungarian
- Lithuanian
- Polish
- Portuguese
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.10.0, 04-03-2023
-=========================================
-
-* GtkTextView
- - Document hanging indentation
-
-* GtkListView
- - Fix a size allocation problem
-
-* GtkFileChooser
- - Fix paned behavior
- - Fix a crash
-
-* GtkText
- - Fix various problems with undo
-
-* Accessibility
- - Make some getters transfer-full
- - Allow setting accessible parents and siblings
- - Add a role for toggle buttons
- - Miscellaneous property fixes and improvements
-
-* gtk
- - Improve the handling resize-during-size-allocate
-
-* gdk
- - Introduce GdkTextureDownloader and use it
- - Make gdk_texture_get_format public
-
-* gsk
- - Make mask nodes more versatile
- - Improve the GL implementation for texture scale nodes
-
-* X11
- - Fix key handling during DND
-
-* Tools
- - gtk-builder-tool: Try harder to handle templates
- - gtk-builder-tool: Prefer properties over <child>
-
-* Translation updates
- Basque
- Belarusian
- Bulgarian
- Indonesian
- Galician
- Georgian
- German
- Hebrew
- Lithuanian
- Portuguese
- Spanish
- Swedish
- Turkish
- Ukrainian
-
+Overview of Changes in 4.9.5, xx-xx-xxxx
+========================================

 Overview of Changes in 4.9.4, 12-02-2023
 ========================================
@@ -9,7 +9,7 @@ constraint_editor_sources = [

 constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
  'constraint-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )

 executable('gtk4-constraint-editor',
@@ -5,8 +5,7 @@ enum
 {
  PROP_TEXTURE = 1,
  PROP_FILTER,
-  PROP_SCALE,
-  PROP_ANGLE,
+  PROP_SCALE
 };

 struct _Demo3Widget
@@ -15,7 +14,6 @@ struct _Demo3Widget

  GdkTexture *texture;
  float scale;
-  float angle;
  GskScalingFilter filter;

  GtkWidget *menu;
@@ -28,85 +26,10 @@ struct _Demo3WidgetClass

 G_DEFINE_TYPE (Demo3Widget, demo3_widget, GTK_TYPE_WIDGET)

-static gboolean
-query_tooltip (GtkWidget  *widget,
-               int         x,
-               int         y,
-               gboolean    keyboard_mode,
-               GtkTooltip *tooltip,
-               gpointer    data)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  GtkWidget *grid;
-  GtkWidget *label;
-  char *s, *s2;
-  const char *filter[] = { "Linear", "Nearest", "Trilinear" };
-  int precision, l;
-
-  grid = gtk_grid_new ();
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-  label = gtk_label_new ("Texture");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
-  s = g_strdup_printf ("%d\342\200\206\303\227\342\200\206%d",
-                       gdk_texture_get_width (self->texture),
-                       gdk_texture_get_height (self->texture));
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
-
-  label = gtk_label_new ("Rotation");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
-  s = g_strdup_printf ("%.1f", self->angle);
-  if (g_str_has_suffix (s, ".0"))
-    s[strlen (s) - 2] = '\0';
-  s2 = g_strconcat (s, "\302\260", NULL);
-  label = gtk_label_new (s2);
-  g_free (s2);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
-
-  label = gtk_label_new ("Scale");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
-
-  precision = 1;
-  do {
-    s = g_strdup_printf ("%.*f", precision, self->scale);
-    l = strlen (s) - 1;
-    while (s[l] == '0')
-      l--;
-    if (s[l] == '.')
-      s[l] = '\0';
-    precision++;
-  } while (strcmp (s, "0") == 0);
-
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
-
-  label = gtk_label_new ("Filter");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
-  label = gtk_label_new (filter[self->filter]);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 3, 1, 1);
-
-  gtk_tooltip_set_custom (tooltip, grid);
-
-  return TRUE;
-}
-
 static void
 demo3_widget_init (Demo3Widget *self)
 {
  self->scale = 1.f;
-  self->angle = 0.f;
  self->filter = GSK_SCALING_FILTER_LINEAR;
  gtk_widget_init_template (GTK_WIDGET (self));
 }
@@ -129,35 +52,26 @@ demo3_widget_snapshot (GtkWidget   *widget,
 {
  Demo3Widget *self = DEMO3_WIDGET (widget);
  int x, y, width, height;
-  double w, h, w2, h2;
+  double w, h;
+  GskRenderNode *node;

  width = gtk_widget_get_width (widget);
  height = gtk_widget_get_height (widget);

-  w2 = w = self->scale * gdk_texture_get_width (self->texture);
-  h2 = h = self->scale * gdk_texture_get_height (self->texture);
+  w = self->scale * gdk_texture_get_width (self->texture);
+  h = self->scale * gdk_texture_get_height (self->texture);

-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      double s = w2;
-      w2 = h2;
-      h2 = s;
-    }
-
-  x = (width - ceil (w2)) / 2;
-  y = (height - ceil (h2)) / 2;
+  x = MAX (0, (width - ceil (w)) / 2);
+  y = MAX (0, (height - ceil (h)) / 2);

  gtk_snapshot_push_clip (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
  gtk_snapshot_save (snapshot);
  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (w2 / 2, h2 / 2));
-  gtk_snapshot_rotate (snapshot, self->angle);
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- w / 2, - h / 2));
-  gtk_snapshot_append_scaled_texture (snapshot,
-                                      self->texture,
-                                      self->filter,
-                                      &GRAPHENE_RECT_INIT (0, 0, w, h));
+  node = gsk_texture_scale_node_new (self->texture,
+                                     &GRAPHENE_RECT_INIT (0, 0, w, h),
+                                     self->filter);
+  gtk_snapshot_append_node (snapshot, node);
+  gsk_render_node_unref (node);
  gtk_snapshot_restore (snapshot);
  gtk_snapshot_pop (snapshot);
 }
@@ -172,26 +86,14 @@ demo3_widget_measure (GtkWidget      *widget,
                      int            *natural_baseline)
 {
  Demo3Widget *self = DEMO3_WIDGET (widget);
-  int width, height;
  int size;

-  width = gdk_texture_get_width (self->texture);
-  height = gdk_texture_get_height (self->texture);
-
-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      int s = width;
-      width = height;
-      height = s;
-    }
-
  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size = width;
+    size = gdk_texture_get_width (self->texture);
  else
-    size = height;
+    size = gdk_texture_get_height (self->texture);

-  *minimum = *natural = (int) ceil (self->scale * size);
+  *minimum = *natural = self->scale * size;
 }

 static void
@@ -209,8 +111,6 @@ demo3_widget_size_allocate (GtkWidget *widget,
  gtk_popover_present (GTK_POPOVER (self->menu));
 }

-static void update_actions (Demo3Widget *self);
-
 static void
 demo3_widget_set_property (GObject      *object,
                           guint         prop_id,
@@ -224,24 +124,11 @@ demo3_widget_set_property (GObject      *object,
    case PROP_TEXTURE:
      g_clear_object (&self->texture);
      self->texture = g_value_dup_object (value);
-      self->scale = 1.f;
-      self->angle = 0.f;
-      self->filter = GSK_SCALING_FILTER_LINEAR;
-      update_actions (self);
      gtk_widget_queue_resize (GTK_WIDGET (object));
-      g_object_notify (object, "scale");
-      g_object_notify (object, "angle");
-      g_object_notify (object, "filter");
      break;

    case PROP_SCALE:
      self->scale = g_value_get_float (value);
-      update_actions (self);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
-    case PROP_ANGLE:
-      self->angle = fmodf (g_value_get_float (value), 360.f);
      gtk_widget_queue_resize (GTK_WIDGET (object));
      break;

@@ -274,10 +161,6 @@ demo3_widget_get_property (GObject     *object,
      g_value_set_float (value, self->scale);
      break;

-    case PROP_ANGLE:
-      g_value_set_float (value, self->angle);
-      break;
-
    case PROP_FILTER:
      g_value_set_enum (value, self->filter);
      break;
@@ -303,14 +186,6 @@ pressed_cb (GtkGestureClick *gesture,
  gtk_popover_popup (GTK_POPOVER (self->menu));
 }

-static void
-update_actions (Demo3Widget *self)
-{
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.in", self->scale < 1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.out", self->scale > 1./1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.reset", self->scale != 1.);
-}
-
 static void
 zoom_cb (GtkWidget  *widget,
         const char *action_name,
@@ -320,30 +195,19 @@ zoom_cb (GtkWidget  *widget,
  float scale;

  if (g_str_equal (action_name, "zoom.in"))
-    scale = MIN (1024., self->scale * M_SQRT2);
+    scale = MIN (10, self->scale * M_SQRT2);
  else if (g_str_equal (action_name, "zoom.out"))
-    scale = MAX (1./1024., self->scale / M_SQRT2);
-  else if (g_str_equal (action_name, "zoom.reset"))
-    scale = 1.0;
+    scale = MAX (0.01, self->scale / M_SQRT2);
  else
-    g_assert_not_reached ();
+    scale = 1.0;
+
+  gtk_widget_action_set_enabled (widget, "zoom.in", scale < 10);
+  gtk_widget_action_set_enabled (widget, "zoom.out", scale > 0.01);
+  gtk_widget_action_set_enabled (widget, "zoom.reset", scale != 1);

  g_object_set (widget, "scale", scale, NULL);
 }

-static void
-rotate_cb (GtkWidget  *widget,
-           const char *action_name,
-           GVariant   *parameter)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  int angle;
-
-  g_variant_get (parameter, "i", &angle);
-
-  g_object_set (widget, "angle", fmodf (self->angle + angle, 360.f), NULL);
-}
-
 static void
 demo3_widget_class_init (Demo3WidgetClass *class)
 {
@@ -365,12 +229,7 @@ demo3_widget_class_init (Demo3WidgetClass *class)

  g_object_class_install_property (object_class, PROP_SCALE,
      g_param_spec_float ("scale", NULL, NULL,
-                          1./1024., 1024., 1.0,
-                          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_ANGLE,
-      g_param_spec_float ("angle", NULL, NULL,
-                          0.0, 360.0, 0.0,
+                          0.0, 10.0, 1.0,
                          G_PARAM_READWRITE));

  g_object_class_install_property (object_class, PROP_FILTER,
@@ -382,7 +241,6 @@ demo3_widget_class_init (Demo3WidgetClass *class)
  gtk_widget_class_install_action (widget_class, "zoom.in", NULL, zoom_cb);
  gtk_widget_class_install_action (widget_class, "zoom.out", NULL, zoom_cb);
  gtk_widget_class_install_action (widget_class, "zoom.reset", NULL, zoom_cb);
-  gtk_widget_class_install_action (widget_class, "rotate", "i", rotate_cb);

  gtk_widget_class_set_template_from_resource (widget_class, "/menu/demo3widget.ui");
  gtk_widget_class_bind_template_child (widget_class, Demo3Widget, menu);
@@ -397,12 +255,7 @@ demo3_widget_new (const char *resource)

  texture = gdk_texture_new_from_resource (resource);

-  self = g_object_new (DEMO3_TYPE_WIDGET,
-                       "texture", texture,
-                       "has-tooltip", TRUE,
-                       NULL);
-
-  g_signal_connect (self, "query-tooltip", G_CALLBACK (query_tooltip), NULL);
+  self = g_object_new (DEMO3_TYPE_WIDGET, "texture", texture, NULL);

  g_object_unref (texture);

@@ -12,11 +12,6 @@
      <attribute name="label">1∶1</attribute>
      <attribute name="action">zoom.reset</attribute>
    </item>
-    <item>
-      <attribute name="label">Rotate</attribute>
-      <attribute name="action">rotate</attribute>
-      <attribute name="target" type="i">90</attribute>
-    </item>
  </menu>
  <template class="Demo3Widget">
    <child>
@@ -30,86 +30,90 @@
                  </object>
                </child>
                <child>
-                  <object class="GtkListBox">
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="row_activated"/>
-                    <style>
-                      <class name="rich-list"/>
-                      <class name="boxed-list"/>
-                    </style>
-
+                  <object class="GtkFrame">
                    <child>
-                      <object class="GtkListBoxRow">
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <signal name="row-activated" handler="row_activated"/>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>
+
                        <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                            <child>
-                              <object class="GtkLabel" id="switch_label">
-                                <property name="label" translatable="yes">Switch</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="switch">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="switch_label">
+                                    <property name="label" translatable="yes">Switch</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSwitch" id="switch">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                  </object>
+                                </child>
                              </object>
                            </child>
                          </object>
                        </child>
-                      </object>
-                    </child>

-                    <child>
-                      <object class="GtkListBoxRow">
                        <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                            <child>
-                              <object class="GtkLabel" id="check_label">
-                                <property name="label" translatable="yes">Check</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="check">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="active">1</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="check_label">
+                                    <property name="label" translatable="yes">Check</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="check">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                </child>
                              </object>
                            </child>
                          </object>
                        </child>
-                      </object>
-                    </child>

-                    <child>
-                      <object class="GtkListBoxRow">
                        <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                            <child>
-                              <object class="GtkLabel" id="image_label">
-                                <property name="label" translatable="yes">Click here!</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="image">
-                                <property name="icon-name">object-select-symbolic</property>
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="opacity">0</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="image_label">
+                                    <property name="label" translatable="yes">Click here!</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkImage" id="image">
+                                    <property name="icon-name">object-select-symbolic</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="opacity">0</property>
+                                  </object>
+                                </child>
                              </object>
                            </child>
                          </object>
@@ -130,142 +134,146 @@
                    </style>
                  </object>
                </child>
-                  <child>
-                    <object class="GtkListBox">
-                      <property name="selection-mode">none</property>
-                      <style>
-                        <class name="rich-list"/>
-                        <class name="boxed-list"/>
-                      </style>
+                <child>
+                  <object class="GtkFrame">
+                    <child>
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>

-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="scale_label">
-                                  <property name="label" translatable="yes">Scale</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkScale">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="draw-value">0</property>
-                                  <property name="width-request">150</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="scale_label">
+                                    <property name="label" translatable="yes">Scale</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScale">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="draw-value">0</property>
+                                    <property name="width-request">150</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>

-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="spin_label">
-                                  <property name="label" translatable="yes">Spinbutton</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkSpinButton">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="dropdown_label">
-                                  <property name="label" translatable="yes">Dropdown</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkDropDown">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="model">
-                                    <object class="GtkStringList">
-                                      <items>
-                                        <item>Choice 1</item>
-                                        <item>Choice 2</item>
-                                        <item>Choice 3</item>
-                                        <item>Choice 4</item>
-                                      </items>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="spin_label">
+                                    <property name="label" translatable="yes">Spinbutton</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="dropdown_label">
+                                    <property name="label" translatable="yes">Dropdown</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkDropDown">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="model">
+                                      <object class="GtkStringList">
+                                        <items>
+                                          <item>Choice 1</item>
+                                          <item>Choice 2</item>
+                                          <item>Choice 3</item>
+                                          <item>Choice 4</item>
+                                        </items>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>

-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="entry_label">
-                                  <property name="label" translatable="yes">Entry</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkEntry">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="placeholder-text">Type here…</property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="entry_label">
+                                    <property name="label" translatable="yes">Entry</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="placeholder-text">Type here…</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>

+                      </object>
+                    </child>
                  </object>
                </child>
              </object>
@@ -1,120 +1,18 @@
-/* Image Scaling
- * #Keywords: zoom, scale, filter, action, menu
+/* Menu
+ * #Keywords: action, zoom
+ *
+ * Demonstrates how to add a context menu to a custom widget
+ * and connect it with widget actions.
 *
 * The custom widget we create here is similar to a GtkPicture,
- * but allows setting a zoom level and filtering mode for the
- * displayed paintable.
+ * but allows setting a zoom level for the displayed paintable.
 *
- * It also demonstrates how to add a context menu to a custom
- * widget and connect it with widget actions.
- *
- * The context menu has items to change the zoom level.
+ * Our context menu has items to change the zoom level.
 */

 #include <gtk/gtk.h>
 #include "demo3widget.h"

-static void
-file_opened (GObject      *source,
-             GAsyncResult *result,
-             void         *data)
-{
-  GFile *file;
-  GError *error = NULL;
-  GdkTexture *texture;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  texture = gdk_texture_new_from_file (file, &error);
-  g_object_unref (file);
-  if (!texture)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  g_object_set (G_OBJECT (data), "texture", texture, NULL);
-  g_object_unref (texture);
-}
-
-static void
-open_file (GtkWidget *picker,
-           GtkWidget *demo)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (picker));
-  GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;
-
-  dialog = gtk_file_dialog_new ();
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, "Images");
-  gtk_file_filter_add_pixbuf_formats (filter);
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
-  g_object_unref (filters);
-
-  gtk_file_dialog_open (dialog, parent, NULL, file_opened, demo);
-
-  g_object_unref (dialog);
-}
-
-static void
-rotate (GtkWidget *button,
-        GtkWidget *demo)
-{
-  float angle;
-
-  g_object_get (demo, "angle", &angle, NULL);
-
-  angle = fmodf (angle + 90.f, 360.f);
-
-  g_object_set (demo, "angle", angle, NULL);
-}
-
-static gboolean
-transform_to (GBinding     *binding,
-              const GValue *src,
-              GValue       *dest,
-              gpointer      user_data)
-{
-  double from;
-  float to;
-
-  from = g_value_get_double (src);
-  to = (float) pow (2., from);
-  g_value_set_float (dest, to);
-
-  return TRUE;
-}
-
-static gboolean
-transform_from (GBinding     *binding,
-                const GValue *src,
-                GValue       *dest,
-                gpointer      user_data)
-{
-  float to;
-  double from;
-
-  to = g_value_get_float (src);
-  from = log2 (to);
-  g_value_set_double (dest, from);
-
-  return TRUE;
-}

 GtkWidget *
 do_menu (GtkWidget *do_widget)
@@ -129,10 +27,9 @@ do_menu (GtkWidget *do_widget)
      GtkWidget *widget;
      GtkWidget *scale;
      GtkWidget *dropdown;
-      GtkWidget *button;

      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Image Scaling");
+      gtk_window_set_title (GTK_WINDOW (window), "Menu");
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
@@ -151,35 +48,19 @@ do_menu (GtkWidget *do_widget)
      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_box_append (GTK_BOX (box), box2);

-      button = gtk_button_new_from_icon_name ("document-open-symbolic");
-      gtk_widget_set_tooltip_text (button, "Open File");
-      g_signal_connect (button, "clicked", G_CALLBACK (open_file), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      button = gtk_button_new_from_icon_name ("object-rotate-right-symbolic");
-      gtk_widget_set_tooltip_text (button, "Rotate");
-      g_signal_connect (button, "clicked", G_CALLBACK (rotate), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, -10., 10., 0.1);
-      gtk_scale_add_mark (GTK_SCALE (scale), 0., GTK_POS_TOP, NULL);
-      gtk_widget_set_tooltip_text (scale, "Zoom");
-      gtk_range_set_value (GTK_RANGE (scale), 0.);
+      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
+      gtk_range_set_value (GTK_RANGE (scale), 1.0);
      gtk_widget_set_hexpand (scale, TRUE);
      gtk_box_append (GTK_BOX (box2), scale);

      dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
-      gtk_widget_set_tooltip_text (dropdown, "Filter");
      gtk_box_append (GTK_BOX (box2), dropdown);

      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
-
-      g_object_bind_property_full (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
-                                   widget, "scale",
-                                   G_BINDING_BIDIRECTIONAL,
-                                   transform_to,
-                                   transform_from,
-                                   NULL, NULL);
+ 
+      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
+                              widget, "scale",
+                              G_BINDING_BIDIRECTIONAL);
    }

  if (!gtk_widget_get_visible (window))
@@ -225,7 +225,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
  gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
    'demo.gresource.xml',
-    source_dir: meson.current_source_dir()
+    source_dir: '.',
  )
 endif

@@ -24,7 +24,6 @@ typedef struct
  GdkRGBA draw_color;
  GtkPadController *pad_controller;
  double brush_size;
-  GtkGesture *gesture;
 } DrawingArea;

 typedef struct
@@ -263,7 +262,7 @@ drawing_area_apply_stroke (DrawingArea   *area,
                           double         y,
                           double         pressure)
 {
-  if (tool && gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
+  if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
    {
      cairo_set_line_width (area->cr, 10 * pressure * area->brush_size);
      cairo_set_operator (area->cr, CAIRO_OPERATOR_DEST_OUT);
@@ -314,9 +313,7 @@ stylus_gesture_motion (GtkGestureStylus *gesture,
          drawing_area_apply_stroke (area, tool,
                                     backlog[i].axes[GDK_AXIS_X],
                                     backlog[i].axes[GDK_AXIS_Y],
-                                     backlog[i].flags & GDK_AXIS_FLAG_PRESSURE
-                                        ? backlog[i].axes[GDK_AXIS_PRESSURE]
-                                        : 1);
+                                     backlog[i].axes[GDK_AXIS_PRESSURE]);
        }

      g_free (backlog);
@@ -346,8 +343,6 @@ drawing_area_init (DrawingArea *area)

  area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
  area->brush_size = 1;
-
-  area->gesture = gesture;
 }

 static GtkWidget *
@@ -386,12 +381,6 @@ drawing_area_color_set (DrawingArea          *area,
  gtk_color_dialog_button_set_rgba (button, color);
 }

-static GtkGesture *
-drawing_area_get_gesture (DrawingArea *area)
-{
-  return area->gesture;
-}
-
 GtkWidget *
 do_paint (GtkWidget *toplevel)
 {
@@ -399,7 +388,7 @@ do_paint (GtkWidget *toplevel)

  if (!window)
    {
-      GtkWidget *draw_area, *headerbar, *button;
+      GtkWidget *draw_area, *headerbar, *colorbutton;

      window = gtk_window_new ();

@@ -408,22 +397,15 @@ do_paint (GtkWidget *toplevel)

      headerbar = gtk_header_bar_new ();

-      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
-      g_signal_connect (button, "notify::rgba",
+      colorbutton = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+      g_signal_connect (colorbutton, "notify::rgba",
                        G_CALLBACK (color_button_color_set), draw_area);
      g_signal_connect (draw_area, "color-set",
-                        G_CALLBACK (drawing_area_color_set), button);
-      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (button),
+                        G_CALLBACK (drawing_area_color_set), colorbutton);
+      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (colorbutton),
                                        &(GdkRGBA) { 0, 0, 0, 1 });

-      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), button);
-
-      button = gtk_check_button_new_with_label ("Stylus only");
-      g_object_bind_property (button, "active",
-                              drawing_area_get_gesture ((DrawingArea *)draw_area), "stylus-only",
-                              G_BINDING_SYNC_CREATE);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar), button);
-
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
      gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
      gtk_window_set_title (GTK_WINDOW (window), "Paint");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
@@ -13,13 +13,20 @@
 static GtkWidget *app_picker;

 static void
-set_file (GFile    *file,
-          gpointer  data)
+file_opened (GObject *source,
+             GAsyncResult *result,
+             void *data)
 {
+  GFile *file;
+  GError *error = NULL;
  char *name;

+  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
+
  if (!file)
    {
+      g_print ("%s\n", error->message);
+      g_error_free (error);
      gtk_widget_set_sensitive (app_picker, FALSE);
      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
      return;
@@ -33,25 +40,6 @@ set_file (GFile    *file,
  g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
 }

-static void
-file_opened (GObject *source,
-             GAsyncResult *result,
-             void *data)
-{
-  GFile *file;
-  GError *error = NULL;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-
-  set_file (file, data);
-}
-
 static gboolean
 abort_mission (gpointer data)
 {
@@ -142,28 +130,11 @@ launch_uri (GtkButton *picker)
  g_object_unref (launcher);
 }

-static gboolean
-on_drop (GtkDropTarget *target,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      set_file (g_value_get_object (value), data);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
  GtkWidget *table, *label, *picker, *button;
-  GtkDropTarget *drop_target;

  if (!window)
  {
@@ -208,13 +179,7 @@ do_pickers (GtkWidget *do_widget)

    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    button = gtk_button_new_from_icon_name ("document-open-symbolic");
-
    label = gtk_label_new ("None");
-
-    drop_target = gtk_drop_target_new (G_TYPE_FILE, GDK_ACTION_COPY);
-    g_signal_connect (drop_target, "drop", G_CALLBACK (on_drop), label);
-    gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (drop_target));
-
    gtk_label_set_xalign (GTK_LABEL (label), 0.);
    gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
    gtk_widget_set_hexpand (label, TRUE);
@@ -22,7 +22,6 @@ show_shortcuts (GtkWidget   *window,
  gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
  g_object_set (overlay, "view-name", view, NULL);
  g_object_unref (builder);
-  gtk_window_present (GTK_WINDOW (overlay));
 }

 G_MODULE_EXPORT void
@@ -1,5 +1,5 @@
 /* Overlay/Transparency
- * #Keywords: GtkOverlay, GtkSnapshot, blur
+ * #Keywords: GtkOverlay, GtkSnapshot
 *
 * Blur the background behind an overlay.
 */
@@ -8,7 +8,7 @@ iconbrowser_sources = [

 iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
  'iconbrowser.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )

 executable('gtk4-icon-browser',
@@ -7,7 +7,7 @@ node_editor_sources = [

 node_editor_resources = gnome.compile_resources('node_editor_resources',
  'node-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )

 executable('gtk4-node-editor',
@@ -32,11 +32,6 @@
 #include "gsk/vulkan/gskvulkanrenderer.h"
 #endif

-#include <cairo.h>
-#ifdef CAIRO_HAS_SVG_SURFACE
-#include <cairo-svg.h>
-#endif
-
 typedef struct
 {
  gsize  start_chars;
@@ -174,7 +169,6 @@ text_changed (GtkTextBuffer    *buffer,
  GtkTextIter iter;
  GtkTextIter start, end;
  float scale;
-  GskRenderNode *big_node;

  g_array_remove_range (self->errors, 0, self->errors->len);
  text = get_current_text (self->text_buffer);
@@ -187,18 +181,13 @@ text_changed (GtkTextBuffer    *buffer,
  self->node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);

  scale = gtk_scale_button_get_value (GTK_SCALE_BUTTON (self->scale_scale));
-  if (self->node && scale != 0.)
+  if (self->node && scale != 1.0)
    {
-      scale = pow (2., scale);
-      big_node = gsk_transform_node_new (self->node, gsk_transform_scale (NULL, scale, scale));
-    }
-  else if (self->node)
-    {
-      big_node = gsk_render_node_ref (self->node);
-    }
-  else
-    {
-      big_node = NULL;
+      GskRenderNode *node;
+
+      node = gsk_transform_node_new (self->node, gsk_transform_scale (NULL, scale, scale));
+      gsk_render_node_unref (self->node);
+      self->node = node;
    }

  g_bytes_unref (bytes);
@@ -210,27 +199,18 @@ text_changed (GtkTextBuffer    *buffer,
      graphene_rect_t bounds;
      guint i;

-      snapshot = gtk_snapshot_new ();
-      gsk_render_node_get_bounds (big_node, &bounds);
-      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
-      gtk_snapshot_append_node (snapshot, big_node);
-      paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
-      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
-      g_clear_object (&paintable);
-
      snapshot = gtk_snapshot_new ();
      gsk_render_node_get_bounds (self->node, &bounds);
      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
      gtk_snapshot_append_node (snapshot, self->node);
      paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
-
+      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
      for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i++)
        {
          gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
          gtk_renderer_paintable_set_paintable (item, paintable);
          g_object_unref (item);
        }
-
      g_clear_object (&paintable);
    }
  else
@@ -238,8 +218,6 @@ text_changed (GtkTextBuffer    *buffer,
      gtk_picture_set_paintable (GTK_PICTURE (self->picture), NULL);
    }

-  g_clear_pointer (&big_node, gsk_render_node_unref);
-
  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);

  while (!gtk_text_iter_is_end (&iter))
@@ -665,34 +643,23 @@ save_cb (GtkWidget        *button,
  g_object_unref (dialog);
 }

-static GskRenderNode *
-create_node (NodeEditorWindow *self)
+static GdkTexture *
+create_texture (NodeEditorWindow *self)
 {
  GdkPaintable *paintable;
  GtkSnapshot *snapshot;
+  GskRenderer *renderer;
  GskRenderNode *node;
+  GdkTexture *texture;

  paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture));
  if (paintable == NULL ||
      gdk_paintable_get_intrinsic_width (paintable) <= 0 ||
      gdk_paintable_get_intrinsic_height (paintable) <= 0)
    return NULL;
-
  snapshot = gtk_snapshot_new ();
  gdk_paintable_snapshot (paintable, snapshot, gdk_paintable_get_intrinsic_width (paintable), gdk_paintable_get_intrinsic_height (paintable));
  node = gtk_snapshot_free_to_node (snapshot);
-
-  return node;
-}
-
-static GdkTexture *
-create_texture (NodeEditorWindow *self)
-{
-  GskRenderer *renderer;
-  GskRenderNode *node;
-  GdkTexture *texture;
-
-  node = create_node (self);
  if (node == NULL)
    return NULL;

@@ -703,58 +670,6 @@ create_texture (NodeEditorWindow *self)
  return texture;
 }

-#ifdef CAIRO_HAS_SVG_SURFACE
-static cairo_status_t
-cairo_serializer_write (gpointer             user_data,
-                        const unsigned char *data,
-                        unsigned int         length)
-{
-  g_byte_array_append (user_data, data, length);
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static GBytes *
-create_svg (GskRenderNode  *node,
-            GError        **error)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  graphene_rect_t bounds;
-  GByteArray *array;
-
-  gsk_render_node_get_bounds (node, &bounds);
-  array = g_byte_array_new ();
-
-  surface = cairo_svg_surface_create_for_stream (cairo_serializer_write,
-                                                 array,
-                                                 bounds.size.width,
-                                                 bounds.size.height);
-  cairo_svg_surface_set_document_unit (surface, CAIRO_SVG_UNIT_PX);
-  cairo_surface_set_device_offset (surface, -bounds.origin.x, -bounds.origin.y);
-
-  cr = cairo_create (surface);
-  gsk_render_node_draw (node, cr);
-  cairo_destroy (cr);
-
-  cairo_surface_finish (surface);
-  if (cairo_surface_status (surface) == CAIRO_STATUS_SUCCESS)
-    {
-      cairo_surface_destroy (surface);
-      return g_byte_array_free_to_bytes (array);
-    }
-  else
-    {
-      g_set_error (error,
-                   G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "%s", cairo_status_to_string (cairo_surface_status (surface)));
-      cairo_surface_destroy (surface);
-      g_byte_array_unref (array);
-      return NULL;
-    }
-}
-#endif
-
 static GdkTexture *
 create_cairo_texture (NodeEditorWindow *self)
 {
@@ -787,140 +702,50 @@ create_cairo_texture (NodeEditorWindow *self)
 }

 static void
-export_image_saved_cb (GObject      *source,
-                       GAsyncResult *result,
-                       void         *user_data)
-{
-  GError *error = NULL;
-
-  if (!g_file_replace_contents_finish (G_FILE (source), result, NULL, &error))
-    {
-      GtkAlertDialog *alert;
-
-      alert = gtk_alert_dialog_new ("Exporting to image failed");
-      gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, NULL);
-      g_object_unref (alert);
-      g_clear_error (&error);
-    }
-}
-
-static void
-export_image_response_cb (GObject      *source,
+export_image_response_cb (GObject *source,
                          GAsyncResult *result,
-                          void         *user_data)
+                          void *user_data)
 {
  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GskRenderNode *node = user_data;
+  GdkTexture *texture = user_data;
  GFile *file;
-  char *uri;
-  GBytes *bytes;

  file = gtk_file_dialog_save_finish (dialog, result, NULL);
-  if (file == NULL)
+  if (file)
    {
-      gsk_render_node_unref (node);
-      return;
-    }
-
-  uri = g_file_get_uri (file);
-#ifdef CAIRO_HAS_SVG_SURFACE
-  if (g_str_has_suffix (uri, "svg"))
-    {
-      GError *error = NULL;
-
-      bytes = create_svg (node, &error);
-      if (bytes == NULL)
+      if (!gdk_texture_save_to_png (texture, g_file_peek_path (file)))
        {
          GtkAlertDialog *alert;

          alert = gtk_alert_dialog_new ("Exporting to image failed");
-          gtk_alert_dialog_set_detail (alert, error->message);
-          gtk_alert_dialog_show (alert, NULL);
+          gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))));
          g_object_unref (alert);
-          g_clear_error (&error);
        }
-    }
-  else
-#endif
-    {
-      GdkTexture *texture;
-      GskRenderer *renderer;

-      renderer = gsk_gl_renderer_new ();
-      if (!gsk_renderer_realize (renderer, NULL, NULL))
-        {
-          g_object_unref (renderer);
-          renderer = gsk_cairo_renderer_new ();
-          if (!gsk_renderer_realize (renderer, NULL, NULL))
-            {
-              g_assert_not_reached ();
-            }
-        }
-      texture = gsk_renderer_render_texture (renderer, node, NULL);
-      gsk_renderer_unrealize (renderer);
-      g_object_unref (renderer);
-
-      if (g_str_has_suffix (uri, "tiff"))
-        bytes = gdk_texture_save_to_tiff_bytes (texture);
-      else
-        bytes = gdk_texture_save_to_png_bytes (texture);
-      g_object_unref (texture);
+      g_object_unref (file);
    }
-  g_free (uri);

-  if (bytes)
-    {
-      g_file_replace_contents_bytes_async (file,
-                                           bytes,
-                                           NULL,
-                                           FALSE,
-                                           0,
-                                           NULL,
-                                           export_image_saved_cb,
-                                           NULL);
-      g_bytes_unref (bytes);
-    }
-  gsk_render_node_unref (node);
-  g_object_unref (file);
+  g_object_unref (texture);
 }

 static void
 export_image_cb (GtkWidget        *button,
                 NodeEditorWindow *self)
 {
-  GskRenderNode *node;
+  GdkTexture *texture;
  GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;

-  node = create_node (self);
-  if (node == NULL)
+  texture = create_texture (self);
+  if (texture == NULL)
    return;

-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/png");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/tiff");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
  dialog = gtk_file_dialog_new ();
  gtk_file_dialog_set_title (dialog, "");
  gtk_file_dialog_set_initial_name (dialog, "example.png");
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
  gtk_file_dialog_save (dialog,
                        GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
                        NULL,
-                        export_image_response_cb, node);
-  g_object_unref (filters);
+                        export_image_response_cb, texture);
  g_object_unref (dialog);
 }

@@ -163,9 +163,9 @@
            <property name="valign">center</property>
            <property name="adjustment">
              <object class="GtkAdjustment">
-                <property name="lower">-4</property>
-                <property name="value">0</property>
-                <property name="upper">4</property>
+                <property name="lower">1</property>
+                <property name="value">1</property>
+                <property name="upper">10</property>
                <property name="step-increment">0.1</property>
                <property name="page-increment">0.5</property>
              </object>
@@ -69,7 +69,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
  widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
    'widget-factory.gresource.xml',
-    source_dir: meson.current_source_dir(),
+    source_dir: '.',
  )
 endif

@@ -6,15 +6,22 @@ Slug: broadway
 The GDK Broadway backend provides support for displaying GTK applications in
 a web browser, using HTML5 and web sockets.

-To run your application in this way, first run the broadway server,
-`gtk-broadwayd`, that ships with GTK:
+To run your application in this way, select the Broadway backend by setting
+`GDK_BACKEND=broadway`. Then you can make your application appear in a web
+browser by pointing it at `http://127.0.0.1:8080`. Note that you need to
+enable web sockets in your web browser.
+
+You can choose a different port from the default 8080 by setting the
+`BROADWAY_DISPLAY` environment variable to the port that you want to use.
+
+It is also possible to use multiple GTK applications in the same web browser
+window, by using the Broadway server, `gtk4-broadwayd`, that ships with GTK.
+To start the Broadway server use:

 ```
 gtk4-broadwayd :5
 ```

-The server expects the colon-prefixed display number as a commandline argument.
-
 Then point your web browser at `http://127.0.0.1:8085`.

 Once the Broadway server is running, you can start your applications like
@@ -24,8 +31,6 @@ this:
 GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
 ```

-Multiple applications can be presented in the same web browser window.
-
 ## Broadway-specific environment variables

 ### `BROADWAY_DISPLAY`
@@ -66,10 +66,6 @@ You can compile the program above with GCC using:
 gcc $( pkg-config --cflags gtk4 ) -o example-0 example-0.c $( pkg-config --libs gtk4 )
 ```

-**Note**: If the above compilation does not work due to an error regarding `G_APPLICATION_DEFAULT_FLAGS`
-this could be due to your OS providing an older version of GLib. For GLib versions older than 2.74 you
-will need to replace `G_APPLICATION_DEFAULT_FLAGS` with `G_APPLICATION_FLAGS_NONE` in this example, and
-others in this documentation.
 For more information on how to compile a GTK application, please
 refer to the [Compiling GTK Applications](compiling.html)
 section in this reference.
@@ -103,14 +103,14 @@ fields, but e.g. buttons can take the focus too.

 Input widgets can be given the focus by clicking on them, but focus
 can also be moved around with certain key events (this is known as
-“keyboard navigation”). GTK reserves the <kbd>Tab</kbd> key to move the focus
-to the next location, and <kbd>Shift</kbd>+<kbd>Tab</kbd> to move it back to the previous
+“keyboard navigation”). GTK reserves the Tab key to move the focus
+to the next location, and Shift-Tab to move it back to the previous
 one. In addition many containers allow “directional navigation” with
 the arrow keys.

 Many widgets can be “activated” to trigger and action. E.g., you can
 activate a button or switch by clicking on them, but you can also
-activate them with the keyboard, by using the <kbd>Enter</kbd> or <kbd>␣</kbd> keys.
+activate them with the keyboard, by using the Enter or Space keys.

 Apart from keyboard navigation, activation and directly typing into
 entries or text views, GTK widgets can use key events for activating
@@ -263,13 +263,10 @@ the question you have, this list is a good place to start.
 *  How do I load an image or animation from a file?

    To load an image file straight into a display widget, use
-    [ctor@Gtk.Picture.new_for_file] or [ctor@Gtk.Picture.new_for_filename].
+    [ctor@Gtk.Picture.new_for_file] or [ctor@GTk.Picture.new_for_filename].
    To load an image for another purpose, use [ctor@Gdk.Texture.new_from_file].
    To load a video from a file, use [ctor@Gtk.MediaFile.new_for_file].

-    Note that [class@Gtk.Image] is meant for fixed-size icons. For arbitrary
-    image files, you should use [class@Gtk.Picture].
-
 *  How do I draw text?

    If you just want to put text into your user interface somewhere, it is
@@ -286,8 +283,8 @@ the question you have, this list is a good place to start.
        pango_font_description_free (fontdesc);
        g_object_unref (layout);

-    See also the [Cairo Rendering](https://docs.gtk.org/PangoCairo/pango_cairo.html)
-    section of the [Pango documentation](https://docs.gtk.org/Pango/).
+    See also the [Cairo Rendering](https://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html)
+    section of the [Pango documentation](https://developer.gnome.org/pango/stable/).

    To draw a piece of text in a widget [vfunc@Gtk.Widget.snapshot] implementation,
    use [method@Gtk.Snapshot.append_layout].
@@ -304,8 +301,8 @@ the question you have, this list is a good place to start.
        pango_font_description_free (fontdesc);
        g_object_unref (layout);

-    See also the [Layout Objects](https://docs.gtk.org/Pango/class.Layout.html)
-    section of the [Pango documentation](https://docs.gtk.org/Pango/).
+    See also the [Layout Objects](https://developer.gnome.org/pango/stable/pango-Layout-Objects.html)
+    section of the [Pango documentation](https://developer.gnome.org/pango/stable/).

 *  Why are types not registered if I use their `GTK_TYPE_BLAH` macro?

@@ -1,6 +1,6 @@
 app2_resources = gnome.compile_resources('exampleapp2_resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 executable('exampleapp2',
  'exampleapp.c', 'exampleappwin.c', 'main.c', app2_resources,
@@ -1,6 +1,6 @@
 app3_resources = gnome.compile_resources('exampleapp3_resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 executable('exampleapp3',
  'exampleapp.c', 'exampleappwin.c', 'main.c', app3_resources,
@@ -1,6 +1,6 @@
 app4_resources = gnome.compile_resources('exampleapp4_resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 executable('exampleapp4',
  'exampleapp.c', 'exampleappwin.c', 'main.c', app4_resources,
@@ -1,6 +1,6 @@
 app5_resources = gnome.compile_resources('exampleapp5_resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 app5_schemas = gnome.compile_schemas()

@@ -1,6 +1,6 @@
 app6_resources = gnome.compile_resources('exampleapp6_resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 app6_schemas = gnome.compile_schemas()

@@ -1,6 +1,6 @@
 app7_resources = gnome.compile_resources('exampleapp7_resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 app7_schemas = gnome.compile_schemas()

@@ -1,6 +1,6 @@
 app8_resources = gnome.compile_resources('exampleapp8 resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 app8_schemas = gnome.compile_schemas()

@@ -1,6 +1,6 @@
 app9_resources = gnome.compile_resources('exampleapp9_resources',
  'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')

 app9_schemas = gnome.compile_schemas()

@@ -1,5 +1,5 @@
 bp_resources = gnome.compile_resources('bloatpad_resources',
                                       'bloatpad.gresources.xml',
-                                       source_dir: meson.current_source_dir())
+                                       source_dir: '.')

 executable('bloatpad', 'bloatpad.c', bp_resources, dependencies: libgtk_dep, c_args: common_cflags)
@@ -1574,8 +1574,7 @@ broadway_server_query_mouse (BroadwayServer *server,

 void
 broadway_server_destroy_surface (BroadwayServer *server,
-                                 int id,
-                                 gboolean disconnected)
+                                 int id)
 {
  BroadwaySurface *surface;
  gint32 transient_for = -1;
@@ -1590,7 +1589,8 @@ broadway_server_destroy_surface (BroadwayServer *server,
    server->pointer_grab_surface_id = -1;

  if (server->output)
-    broadway_output_destroy_surface (server->output, id);
+    broadway_output_destroy_surface (server->output,
+                                     id);

  surface = broadway_server_lookup_surface (server, id);
  if (surface != NULL)
@@ -1604,7 +1604,7 @@ broadway_server_destroy_surface (BroadwayServer *server,
      broadway_surface_free (server, surface);
    }

-  if (transient_for != -1 && !disconnected)
+  if (transient_for != -1)
    {
      surface = broadway_server_lookup_surface (server, transient_for);
      if (surface != NULL)
@@ -93,8 +93,7 @@ guint32             broadway_server_new_surface               (BroadwayServer  *
                                                               int              width,
                                                               int              height);
 void                broadway_server_destroy_surface           (BroadwayServer  *server,
-                                                               int              id,
-                                                               gboolean         disconnected);
+                                                               int              id);
 gboolean            broadway_server_surface_show              (BroadwayServer  *server,
                                                               int              id);
 gboolean            broadway_server_surface_hide              (BroadwayServer  *server,
@@ -101,7 +101,8 @@ client_disconnected (BroadwayClient *client)
    }

  for (l = client->surfaces; l != NULL; l = l->next)
-    broadway_server_destroy_surface (server, GPOINTER_TO_UINT (l->data), TRUE);
+    broadway_server_destroy_surface (server,
+                                     GPOINTER_TO_UINT (l->data));
  g_list_free (client->surfaces);
  client->surfaces = NULL;

@@ -267,7 +268,7 @@ client_handle_request (BroadwayClient *client,
      client->surfaces =
        g_list_remove (client->surfaces,
                       GUINT_TO_POINTER (request->destroy_surface.id));
-      broadway_server_destroy_surface (server, request->destroy_surface.id, FALSE);
+      broadway_server_destroy_surface (server, request->destroy_surface.id);
      break;
    case BROADWAY_REQUEST_SHOW_SURFACE:
      broadway_server_surface_show (server, request->show_surface.id);
@@ -60,11 +60,7 @@ GdkDebugFlags    gdk_display_get_debug_flags    (GdkDisplay       *display);
 void             gdk_display_set_debug_flags    (GdkDisplay       *display,
                                                 GdkDebugFlags     flags);

-#ifdef GLIB_USING_SYSTEM_PRINTF
-#define gdk_debug_message(format, ...) fprintf (stderr, format "\n", ##__VA_ARGS__)
-#else
 #define gdk_debug_message(format, ...) g_fprintf (stderr, format "\n", ##__VA_ARGS__)
-#endif

 #ifdef G_ENABLE_DEBUG

@@ -1723,6 +1723,8 @@ gdk_display_init_egl (GdkDisplay  *self,
    epoxy_has_egl_extension (priv->egl_display, "EGL_KHR_no_config_context");
  self->have_egl_pixel_format_float =
    epoxy_has_egl_extension (priv->egl_display, "EGL_EXT_pixel_format_float");
+  self->have_egl_win32_libangle =
+    epoxy_has_egl_extension (priv->egl_display, "EGL_ANGLE_d3d_share_handle_client_buffer");

  if (self->have_egl_no_config_context)
    priv->egl_config_high_depth = gdk_display_create_egl_config (self,
@@ -410,19 +410,12 @@ gdk_display_manager_open_display (GdkDisplayManager *manager,
    {
      const char *backend = backends[i];
      gboolean any = g_str_equal (backend, "*");
-      gboolean found = FALSE;

      if (!allow_any && !any && !strstr (allowed_backends, backend))
-        {
-          GDK_DEBUG (MISC, "Skipping %s backend", backend);
-          continue;
-        }
+        continue;

      for (j = 0; gdk_backends[j].name != NULL; j++)
        {
-          if (g_str_equal (backend, gdk_backends[j].name))
-            found = TRUE;
-
          if ((any && allow_any) ||
              (any && strstr (allowed_backends, gdk_backends[j].name)) ||
              g_str_equal (backend, gdk_backends[j].name))
@@ -430,15 +423,9 @@ gdk_display_manager_open_display (GdkDisplayManager *manager,
              GDK_DEBUG (MISC, "Trying %s backend", gdk_backends[j].name);
              display = gdk_backends[j].open_display (name);
              if (display)
-                {
-                  GDK_DEBUG (MISC, "Using %s display %s", gdk_backends[j].name, gdk_display_get_name (display));
-                  break;
-                }
+                break;
            }
        }
-
-      if (!found && !display)
-        g_warning ("No such backend: %s", backend);
    }

  g_strfreev (backends);
@@ -109,6 +109,7 @@ struct _GdkDisplay
  guint have_egl_buffer_age : 1;
  guint have_egl_no_config_context : 1;
  guint have_egl_pixel_format_float : 1;
+  guint have_egl_win32_libangle : 1;
 };

 struct _GdkDisplayClass
@@ -48,7 +48,7 @@
 * for the synchronization being implemented, the clock will process a frame and
 * emit signals for each phase that has been requested. (See the signals of the
 * `GdkFrameClock` class for documentation of the phases.
- * %GDK_FRAME_CLOCK_PHASE_UPDATE and the [signal@Gdk.FrameClock::update] signal
+ * %GDK_FRAME_CLOCK_PHASE_UPDATE and the [signal@GdkFrameClock::update] signal
 * are most interesting for application writers, and are used to update the
 * animations, using the frame time given by [method@Gdk.FrameClock.get_frame_time].
 *
@@ -60,7 +60,7 @@
 * are called at a “similar” time get the same value. This means that
 * if different animations are timed by looking at the difference in
 * time between an initial value from [method@Gdk.FrameClock.get_frame_time]
- * and the value inside the [signal@Gdk.FrameClock::update] signal of the clock,
+ * and the value inside the [signal@GdkFrameClock::update] signal of the clock,
 * they will stay exactly synchronized.
 */

@@ -584,6 +584,8 @@ gdk_frame_clock_paint_idle (void *data)
                {
                  priv->requested &= ~GDK_FRAME_CLOCK_PHASE_LAYOUT;
                  _gdk_frame_clock_emit_layout (clock);
+                  if (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)
+                    g_print ("looping in layout %d\n", iter);
                }
 	      if (iter == 5)
 		g_warning ("gdk-frame-clock: layout continuously requested, giving up after 4 tries");
@@ -809,3 +811,12 @@ _gdk_frame_clock_idle_new (void)

  return GDK_FRAME_CLOCK (clock);
 }
+
+GdkFrameClockPhase
+gdk_frame_clock_get_current_phase (GdkFrameClock *clock)
+{
+  GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
+  GdkFrameClockIdlePrivate *priv = clock_idle->priv;
+
+  return priv->phase;
+}
@@ -127,6 +127,8 @@ void _gdk_frame_clock_emit_paint         (GdkFrameClock *frame_clock);
 void _gdk_frame_clock_emit_after_paint   (GdkFrameClock *frame_clock);
 void _gdk_frame_clock_emit_resume_events (GdkFrameClock *frame_clock);

+GdkFrameClockPhase gdk_frame_clock_get_current_phase (GdkFrameClock *frame_clock);
+
 G_END_DECLS

 #endif /* __GDK_FRAME_CLOCK_PRIVATE_H__ */
@@ -295,6 +295,7 @@ gdk_gl_context_create_egl_context (GdkGLContext *context,
  /* We will use the default version matching the context status
   * unless the user requested a version which makes sense */
  gdk_gl_context_get_matching_version (api, legacy,
+                                       display->have_egl_win32_libangle,
                                       &min_major, &min_minor);
  gdk_gl_context_get_clipped_version (context,
                                      min_major, min_minor,
@@ -967,6 +968,7 @@ gdk_gl_context_get_forward_compatible (GdkGLContext *context)
 void
 gdk_gl_context_get_matching_version (GdkGLAPI  api,
                                     gboolean  legacy,
+                                     gboolean  win32_libangle,
                                     int      *major,
                                     int      *minor)
 {
@@ -987,8 +989,16 @@ gdk_gl_context_get_matching_version (GdkGLAPI  api,
    }
  else
    {
-      maj = GDK_GL_MIN_GLES_VERSION_MAJOR;
-      min = GDK_GL_MIN_GLES_VERSION_MINOR;
+      if (win32_libangle)
+        {
+          maj = GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MAJOR;
+          min = GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MINOR;
+        }
+      else
+        {
+          maj = GDK_GL_MIN_GLES_VERSION_MAJOR;
+          min = GDK_GL_MIN_GLES_VERSION_MINOR;
+        }
    }

  if (major != NULL)
@@ -37,7 +37,8 @@ G_BEGIN_DECLS
 * Backends should make sure to never create a context of a previous version.
 *
 * The macros refer to OpenGL; OpenGL with OPENGL_COMPATIBILITY_PROFILE_BIT as
- * OPENGL_PROFILE_MASK; and OpenGL ES respectively
+ * OPENGL_PROFILE_MASK; OpenGL ES; and OpenGL ES win32 Angle implementation,
+ * respectively
 */
 #define GDK_GL_MIN_GL_VERSION_MAJOR (3)
 #define GDK_GL_MIN_GL_VERSION_MINOR (2)
@@ -45,6 +46,8 @@ G_BEGIN_DECLS
 #define GDK_GL_MIN_GL_LEGACY_VERSION_MINOR (0)
 #define GDK_GL_MIN_GLES_VERSION_MAJOR (2)
 #define GDK_GL_MIN_GLES_VERSION_MINOR (0)
+#define GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MAJOR (3)
+#define GDK_GL_MIN_GLES_WIN32_ANGLE_VERSION_MINOR (0)

 typedef enum {
  GDK_GL_NONE = 0,
@@ -98,6 +101,7 @@ typedef struct {
 } GdkGLContextProgram;

 typedef struct {
+  guint vertex_array_object;
  guint tmp_framebuffer;
  guint tmp_vertex_buffer;

@@ -137,6 +141,7 @@ void                    gdk_gl_context_get_clipped_version      (GdkGLContext
                                                                 int             *minor);
 void                    gdk_gl_context_get_matching_version     (GdkGLAPI         api,
                                                                 gboolean         legacy,
+                                                                 gboolean         win32_libangle,
                                                                 int             *major,
                                                                 int             *minor);

@@ -335,7 +335,6 @@ gdk_gl_texture_determine_format (GdkGLTexture *self)
  switch (internal_format)
  {
    case GL_RGB8:
-    case GL_RGB:
      texture->format = GDK_MEMORY_R8G8B8;
      break;

@@ -178,10 +178,10 @@ gdk_memory_texture_new_subtexture (GdkMemoryTexture  *source,
  GBytes *bytes;

  g_return_val_if_fail (GDK_IS_MEMORY_TEXTURE (source), NULL);
-  g_return_val_if_fail (x >= 0 && x < GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (y >= 0 && y < GDK_TEXTURE (source)->height, NULL);
-  g_return_val_if_fail (width > 0 && x + width <= GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (height > 0 && y + height <= GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (x >= 0 || x < GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (y >= 0 || y < GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (width > 0 || x + width <= GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (height > 0 || y + height <= GDK_TEXTURE (source)->height, NULL);

  texture = GDK_TEXTURE (source);
  bpp = gdk_memory_format_bytes_per_pixel (texture->format);
@@ -50,7 +50,7 @@ void            gtk_snapshot_pop                        (GdkSnapshot
 * to do, it is suggested that you scale your paintable ignoring any potential
 * aspect ratio.
 *
- * The contents that a `GdkPaintable` produces may depend on the [class@Gdk.Snapshot]
+ * The contents that a `GdkPaintable` produces may depend on the [class@GdkSnapshot]
 * passed to it. For example, paintables may decide to use more detailed images
 * on higher resolution screens or when OpenGL is available. A `GdkPaintable`
 * will however always produce the same output for the same snapshot.
@@ -58,7 +58,7 @@ void            gtk_snapshot_pop                        (GdkSnapshot
 * A `GdkPaintable` may change its contents, meaning that it will now produce
 * a different output with the same snapshot. Once that happens, it will call
 * [method@Gdk.Paintable.invalidate_contents] which will emit the
- * [signal@Gdk.Paintable::invalidate-contents] signal. If a paintable is known
+ * [signal@GdkPaintable::invalidate-contents] signal. If a paintable is known
 * to never change its contents, it will set the %GDK_PAINTABLE_STATIC_CONTENTS
 * flag. If a consumer cannot deal with changing contents, it may call
 * [method@Gdk.Paintable.get_current_image] which will return a static
@@ -69,7 +69,7 @@ void            gtk_snapshot_pop                        (GdkSnapshot
 * can use this information to layout thepaintable appropriately. Just like the
 * contents, the size of a paintable can change. A paintable will indicate this
 * by calling [method@Gdk.Paintable.invalidate_size] which will emit the
- * [signal@Gdk.Paintable::invalidate-size] signal. And just like for contents,
+ * [signal@GdkPaintable::invalidate-size] signal. And just like for contents,
 * if a paintable is known to never change its size, it will set the
 * %GDK_PAINTABLE_STATIC_SIZE flag.
 *
@@ -529,7 +529,7 @@ gdk_paintable_compute_concrete_size (GdkPaintable *paintable,
           * the missing dimension is calculated from the present
           * dimension and the intrinsic aspect ratio.
           * Otherwise, the missing dimension is taken from the default
-           * object size.
+           * object size. 
           */
          if (image_width)
            *concrete_width = image_width;
@@ -559,7 +559,7 @@ gdk_paintable_compute_concrete_size (GdkPaintable *paintable,
   * dimensions, the missing dimension is taken from the object's intrinsic
   * dimensions.
   * Otherwise, the missing dimension of the concrete object size is taken
-   * from the default object size.
+   * from the default object size. 
   */
  if (specified_width)
    {
@@ -37,10 +37,10 @@ G_DECLARE_INTERFACE (GdkPaintable, gdk_paintable, GDK, PAINTABLE, GObject)
 /**
 * GdkPaintableFlags:
 * @GDK_PAINTABLE_STATIC_SIZE: The size is immutable.
- *   The [signal@Gdk.Paintable::invalidate-size] signal will never be
+ *   The [signal@GdkPaintable::invalidate-size] signal will never be
 *   emitted.
 * @GDK_PAINTABLE_STATIC_CONTENTS: The content is immutable.
- *   The [signal@Gdk.Paintable::invalidate-contents] signal will never be
+ *   The [signal@GdkPaintable::invalidate-contents] signal will never be
 *   emitted.
 *
 * Flags about a paintable object.
@@ -97,7 +97,7 @@ struct _GdkPaintableInterface
                                                         double                  height);
  /* get the current contents in an immutable form (optional) */
  GdkPaintable *        (* get_current_image)           (GdkPaintable           *paintable);
-
+   
  /* get flags for potential optimizations (optional) */
  GdkPaintableFlags     (* get_flags)                   (GdkPaintable           *paintable);
  /* preferred width of paintable or 0 if it has no width (optional) */
@@ -31,7 +31,7 @@
 * The `GdkPopup` is positioned relative to its parent surface.
 *
 * `GdkPopup`s are typically used to implement menus and similar popups.
- * They can be modal, which is indicated by the [property@Gdk.Popup:autohide]
+ * They can be modal, which is indicated by the [property@GdkPopup:autohide]
 * property.
 */

@@ -113,7 +113,7 @@ gdk_popup_default_init (GdkPopupInterface *iface)
 * otherwise it will change position according to @layout.
 *
 * After calling this function, the result should be handled in response
- * to the [signal@Gdk.Surface::layout] signal being emitted. The resulting
+ * to the [signal@GdkSurface::layout] signal being emitted. The resulting
 * popup position can be queried using [method@Gdk.Popup.get_position_x],
 * [method@Gdk.Popup.get_position_y], and the resulting size will be sent as
 * parameters in the layout signal. Use [method@Gdk.Popup.get_rect_anchor]
@@ -395,7 +395,7 @@ gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf)

  bytes = g_bytes_new_with_free_func (gdk_pixbuf_get_pixels (pixbuf),
                                      gdk_pixbuf_get_height (pixbuf)
-                                      * (gsize) gdk_pixbuf_get_rowstride (pixbuf),
+                                      * gdk_pixbuf_get_rowstride (pixbuf),
                                      g_object_unref,
                                      g_object_ref (pixbuf));
  texture = gdk_memory_texture_new (gdk_pixbuf_get_width (pixbuf),
@@ -261,16 +261,15 @@ gdk_toplevel_default_init (GdkToplevelInterface *iface)
  /**
   * GdkToplevel::compute-size:
   * @toplevel: a `GdkToplevel`
-   * @size: (type Gdk.ToplevelSize): a `GdkToplevelSize`
+   * @size: (type Gdk.ToplevelSize) (out caller-allocates): a `GdkToplevelSize`
   *
   * Emitted when the size for the surface needs to be computed, when
   * it is present.
   *
-   * This signal will normally be emitted during or after a call to
-   * [method@Gdk.Toplevel.present], depending on the configuration
-   * received by the windowing system. It may also be emitted at any
-   * other point in time, in response to the windowing system
-   * spontaneously changing the configuration of the toplevel surface.
+   * It will normally be emitted during or after [method@Gdk.Toplevel.present],
+   * depending on the configuration received by the windowing system.
+   * It may also be emitted at any other point in time, in response
+   * to the windowing system spontaneously changing the configuration.
   *
   * It is the responsibility of the toplevel user to handle this signal
   * and compute the desired size of the toplevel, given the information
@@ -131,7 +131,7 @@ gdk_gresource_xml = configure_file(output: 'gdk.gresource.xml',

 gdkresources = gnome.compile_resources('gdkresources',
  gdk_gresource_xml,
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
  c_name: '_gdk',
  extra_args: '--manual-register',
 )
@@ -586,6 +586,13 @@ _gdk_wayland_display_open (const char *display_name)

  GDK_DEBUG (MISC, "opening display %s", display_name ? display_name : "");

+  /* If this variable is unset then wayland initialisation will surely
+   * fail, logging a fatal error in the process.  Save ourselves from
+   * that.
+   */
+  if (g_getenv ("XDG_RUNTIME_DIR") == NULL)
+    return NULL;
+
  wl_log_set_handler_client (log_handler);

  wl_display = wl_display_connect (display_name);
@@ -1075,9 +1082,6 @@ gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
  g_assert (display_wayland);
  g_assert (display_wayland->shm);

-  if (size == 0)
-    size = 24;
-
  if (g_strcmp0 (name, display_wayland->cursor_theme_name) == 0 &&
      display_wayland->cursor_theme_size == size)
    return;
@@ -65,9 +65,6 @@ gdk_wayland_gl_context_end_frame (GdkDrawContext *draw_context,
  int dx = impl->pending_buffer_offset_x;
  int dy = impl->pending_buffer_offset_y;

-  impl->pending_buffer_offset_x = 0;
-  impl->pending_buffer_offset_y = 0;
-
  gdk_wayland_surface_sync (surface);
  gdk_wayland_surface_request_frame (surface);

@@ -121,7 +118,7 @@ gdk_wayland_display_init_gl (GdkDisplay  *display,
 {
  GdkWaylandDisplay *self = GDK_WAYLAND_DISPLAY (display);

-  if (!gdk_display_init_egl (display,
+  if (!gdk_display_init_egl (display, 
                             EGL_PLATFORM_WAYLAND_EXT,
                             self->wl_display,
                             TRUE,
@@ -398,11 +398,7 @@ gdk_wayland_popup_handle_configure (GdkWaylandSurface *wayland_surface)
    g_warn_if_reached ();

  if (wayland_popup->pending.has_repositioned_token)
-    {
-      wayland_popup->received_reposition_token =
-        wayland_popup->pending.repositioned_token;
-      wayland_popup->pending.has_repositioned_token = FALSE;
-    }
+    wayland_popup->received_reposition_token = wayland_popup->pending.repositioned_token;

  switch (wayland_popup->state)
    {
@@ -747,7 +743,9 @@ create_dynamic_positioner (GdkWaylandPopup *wayland_popup,
    GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
  GdkRectangle geometry;
  uint32_t constraint_adjustment = ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE;
-  GdkRectangle anchor_rect;
+  const GdkRectangle *anchor_rect;
+  int real_anchor_rect_x, real_anchor_rect_y;
+  int anchor_rect_width, anchor_rect_height;
  int rect_anchor_dx;
  int rect_anchor_dy;
  GdkGravity rect_anchor;
@@ -773,24 +771,12 @@ create_dynamic_positioner (GdkWaylandPopup *wayland_popup,

  gdk_wayland_surface_get_window_geometry (surface->parent, &parent_geometry);

-  anchor_rect = *gdk_popup_layout_get_anchor_rect (layout);
+  anchor_rect = gdk_popup_layout_get_anchor_rect (layout);
+  real_anchor_rect_x = anchor_rect->x - parent_geometry.x;
+  real_anchor_rect_y = anchor_rect->y - parent_geometry.y;

-  /* Wayland protocol requires that the anchor rect is specified
-   * wrt. to the parent geometry, and that it is non-empty and
-   * contained in the parent geometry.
-   */
-  if (!gdk_rectangle_intersect (&parent_geometry, &anchor_rect, &anchor_rect))
-    {
-      anchor_rect.x = 0;
-      anchor_rect.y = 0;
-      anchor_rect.width = 1;
-      anchor_rect.height = 1;
-    }
-  else
-    {
-      anchor_rect.x -= parent_geometry.x;
-      anchor_rect.y -= parent_geometry.y;
-    }
+  anchor_rect_width = MAX (anchor_rect->width, 1);
+  anchor_rect_height = MAX (anchor_rect->height, 1);

  gdk_popup_layout_get_offset (layout, &rect_anchor_dx, &rect_anchor_dy);

@@ -811,10 +797,10 @@ create_dynamic_positioner (GdkWaylandPopup *wayland_popup,

        xdg_positioner_set_size (positioner, geometry.width, geometry.height);
        xdg_positioner_set_anchor_rect (positioner,
-                                        anchor_rect.x,
-                                        anchor_rect.y,
-                                        anchor_rect.width,
-                                        anchor_rect.height);
+                                        real_anchor_rect_x,
+                                        real_anchor_rect_y,
+                                        anchor_rect_width,
+                                        anchor_rect_height);
        xdg_positioner_set_offset (positioner, rect_anchor_dx, rect_anchor_dy);

        anchor = rect_anchor_to_anchor (rect_anchor);
@@ -865,10 +851,10 @@ create_dynamic_positioner (GdkWaylandPopup *wayland_popup,

        zxdg_positioner_v6_set_size (positioner, geometry.width, geometry.height);
        zxdg_positioner_v6_set_anchor_rect (positioner,
-                                            anchor_rect.x,
-                                            anchor_rect.y,
-                                            anchor_rect.width,
-                                            anchor_rect.height);
+                                            real_anchor_rect_x,
+                                            real_anchor_rect_y,
+                                            anchor_rect_width,
+                                            anchor_rect_height);
        zxdg_positioner_v6_set_offset (positioner,
                                       rect_anchor_dx,
                                       rect_anchor_dy);
@@ -982,9 +968,6 @@ gdk_wayland_surface_create_xdg_popup (GdkWaylandPopup *wayland_popup,
      g_assert_not_reached ();
    }

-  wayland_popup->received_reposition_token = 0;
-  wayland_popup->reposition_token = 0;
-
  gdk_popup_layout_get_shadow_width (layout,
                                     &impl->shadow_left,
                                     &impl->shadow_right,
@@ -99,7 +99,7 @@ gdk_wayland_primary_claim_remote (GdkWaylandPrimary                     *cb,

  if (cb->source)
    {
-      GDK_DISPLAY_DEBUG (gdk_clipboard_get_display (GDK_CLIPBOARD (cb)), CLIPBOARD, "%p: Ignoring primary offer for self", cb);
+      GDK_DISPLAY_DEBUG (gdk_clipboard_get_display (GDK_CLIPBOARD (cb)), CLIPBOARD, "%p: Ignoring clipboard offer for self", cb);
      gdk_content_formats_unref (formats);
      g_clear_pointer (&offer, zwp_primary_selection_offer_v1_destroy);
      return;
@@ -111,7 +111,7 @@ gdk_wayland_primary_claim_remote (GdkWaylandPrimary                     *cb,
  if (GDK_DISPLAY_DEBUG_CHECK (gdk_clipboard_get_display (GDK_CLIPBOARD (cb)), CLIPBOARD))
    {
      char *s = gdk_content_formats_to_string (formats);
-      gdk_debug_message ("%p: remote primary claim for %s", cb, s);
+      gdk_debug_message ("%p: remote clipboard claim for %s", cb, s);
      g_free (s);
    }
 #endif
@@ -119,7 +119,8 @@ gdk_wayland_primary_claim_remote (GdkWaylandPrimary                     *cb,
  cb->offer_formats = formats;
  cb->offer = offer;

-  gdk_clipboard_claim_remote (GDK_CLIPBOARD (cb), cb->offer_formats);
+  gdk_clipboard_claim_remote (GDK_CLIPBOARD (cb),
+                              cb->offer_formats);
 }

 static void
@@ -270,14 +271,6 @@ gdk_wayland_primary_claim (GdkClipboard       *clipboard,
 {
  GdkWaylandPrimary *cb = GDK_WAYLAND_PRIMARY (clipboard);

-#ifdef G_ENABLE_DEBUG
-  if (GDK_DISPLAY_DEBUG_CHECK (gdk_clipboard_get_display (clipboard), CLIPBOARD))
-    {
-      char *s = gdk_content_formats_to_string (formats);
-      gdk_debug_message ("%p: claim primary (%s) for %s", cb, local ? "local" : "remote", s);
-      g_free (s);
-    }
-#endif
  if (local)
    {
      GdkWaylandDisplay *wdisplay = GDK_WAYLAND_DISPLAY (gdk_clipboard_get_display (clipboard));
@@ -520,6 +520,8 @@ _gdk_wayland_display_create_surface (GdkDisplay     *display,
  surface->width = width;
  surface->height = height;

+  g_object_ref (surface);
+
  /* More likely to be right than just assuming 1 */
  if (display_wayland->compositor_version >= WL_SURFACE_HAS_BUFFER_SCALE)
    {
@@ -559,14 +561,8 @@ gdk_wayland_surface_attach_image (GdkSurface           *surface,
  /* Attach this new buffer to the surface */
  wl_surface_attach (impl->display_server.wl_surface,
                     _gdk_wayland_shm_surface_get_wl_buffer (cairo_surface),
-                     0, 0);
-
-  if ((impl->pending_buffer_offset_x || impl->pending_buffer_offset_y) &&
-      wl_surface_get_version (impl->display_server.wl_surface) >=
-      WL_SURFACE_OFFSET_SINCE_VERSION)
-    wl_surface_offset (impl->display_server.wl_surface,
-                       impl->pending_buffer_offset_x,
-                       impl->pending_buffer_offset_y);
+                     impl->pending_buffer_offset_x,
+                     impl->pending_buffer_offset_y);
  impl->pending_buffer_offset_x = 0;
  impl->pending_buffer_offset_y = 0;

@@ -630,7 +626,7 @@ gdk_wayland_surface_dispose (GObject *object)
        GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));

      display_wayland->event_queues =
-        g_list_remove (display_wayland->event_queues, impl->event_queue);
+        g_list_remove (display_wayland->event_queues, surface);
      g_clear_pointer (&impl->event_queue, wl_event_queue_destroy);
    }

@@ -975,15 +971,6 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
          impl->display_server.egl_window = NULL;
        }

-      impl->awaiting_frame = FALSE;
-      if (impl->awaiting_frame_frozen)
-        {
-          impl->awaiting_frame_frozen = FALSE;
-          gdk_surface_thaw_updates (surface);
-        }
-
-      GDK_WAYLAND_SURFACE_GET_CLASS (impl)->hide_surface (impl);
-
      if (impl->display_server.xdg_surface)
        {
          xdg_surface_destroy (impl->display_server.xdg_surface);
@@ -1002,6 +989,15 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
            impl->initial_configure_received = FALSE;
        }

+      impl->awaiting_frame = FALSE;
+      if (impl->awaiting_frame_frozen)
+        {
+          impl->awaiting_frame_frozen = FALSE;
+          gdk_surface_thaw_updates (surface);
+        }
+
+      GDK_WAYLAND_SURFACE_GET_CLASS (impl)->hide_surface (impl);
+
      g_clear_pointer (&impl->display_server.wl_surface, wl_surface_destroy);

      g_slist_free (impl->display_server.outputs);
@@ -991,7 +991,7 @@ gdk_wayland_toplevel_set_startup_id (GdkWaylandToplevel *toplevel,
      startup_id = free_me;
    }

-  if (display->xdg_activation && startup_id)
+  if (startup_id)
    xdg_activation_v1_activate (display->xdg_activation,
                                startup_id,
                                surface->display_server.wl_surface);
@@ -1005,8 +1005,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
  } bmi;
  HDC hdc;
  uint8_t *pixels, *bits;
-  int x, y, w, h;
-  gsize rowstride;
+  int rowstride, x, y, w, h;

  if (!GDI_CALL (GetIconInfo, (hicon, &ii)))
    return NULL;
@@ -1058,7 +1057,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
 		no_alpha = FALSE;
 	      pixels += 4;
 	    }
-	  pixels += rowstride - w * 4;
+	  pixels += (w * 4 - rowstride);
 	}

      /* mask */
@@ -1073,7 +1072,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
 		  pixels[3] = 255 - bits[(x + y * w) * 4];
 		  pixels += 4;
 		}
-	      pixels += rowstride - w * 4;
+	      pixels += (w * 4 - rowstride);
 	    }
 	}
    }
@@ -1147,7 +1146,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
 		  xorp++;
 		}
 	    }
-	  pixels += rowstride - w * 4;
+	  pixels += (w * 4 - rowstride);
 	}
    }

@@ -1207,7 +1207,6 @@ gdk_win32_display_init_gl (GdkDisplay  *display,
        {
          return g_object_new (GDK_TYPE_WIN32_GL_CONTEXT_EGL,
                               "display", display,
-                               "allowed-apis", GDK_GL_API_GLES,
                               NULL);
        }
      else
@@ -83,13 +83,20 @@ gdk_win32_gl_context_egl_end_frame (GdkDrawContext *draw_context,
                                    cairo_region_t *painted)
 {
  GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
+  GdkWin32GLContextEGL *context_egl = GDK_WIN32_GL_CONTEXT_EGL (context);
  GdkSurface *surface = gdk_gl_context_get_surface (context);
  GdkDisplay *display = gdk_gl_context_get_display (context);
+  cairo_rectangle_int_t whole_window;
  EGLSurface egl_surface;

  GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_egl_parent_class)->end_frame (draw_context, painted);

  gdk_gl_context_make_current (context);
+  whole_window =
+    (GdkRectangle) { 0, 0,
+	                 gdk_surface_get_width (surface),
+					 gdk_surface_get_height (surface)
+                   };

  egl_surface = gdk_surface_get_egl_surface (surface);

@@ -1,56 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- *
- * gdkglcontext-win32-wgl-private.c: Win32 specific OpenGL wrappers
- *
- * Copyright © 2023 Chun-wei Fan
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * These wrapper functions are used when we don't want to use the wgl*() core functions
- * that we acquire via libepoxy (such as when we are disposing the Gdk(W)GLContext from,
- * different threads, so for these calls, we are actually linking to the system's/ICD
- * opengl32.dll directly, so that we are guaranteed that the "right" versions of these
- * WGL calls are carried out.  This must be a separate source file because we can't include
- * the system's GL/gl.h with epoxy/(w)gl.h together in a single source file.  We should not
- * need to use these when we are creating/initializing a WGL context in GDK, since we should
- * be in the same thread at this point.
- */
-
-#define DONT_INCLUDE_LIBEPOXY
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <GL/gl.h>
-
-#include "gdkglcontext-win32.h"
-
-void
-gdk_win32_private_wglDeleteContext (HGLRC hglrc)
-{
-  wglDeleteContext (hglrc);
-}
-
-HGLRC
-gdk_win32_private_wglGetCurrentContext (void)
-{
-  return wglGetCurrentContext ();
-}
-
-BOOL
-gdk_win32_private_wglMakeCurrent (HDC   hdc,
-                                  HGLRC hglrc)
-{
-  return wglMakeCurrent (hdc, hglrc);
-}
@@ -60,12 +60,12 @@ gdk_win32_gl_context_wgl_dispose (GObject *gobject)

  if (context_wgl->wgl_context != NULL)
    {
-      if (gdk_win32_private_wglGetCurrentContext () == context_wgl->wgl_context)
-        gdk_win32_private_wglMakeCurrent (NULL, NULL);
+      if (wglGetCurrentContext () == context_wgl->wgl_context)
+        wglMakeCurrent (NULL, NULL);

      GDK_NOTE (OPENGL, g_print ("Destroying WGL context\n"));

-      gdk_win32_private_wglDeleteContext (context_wgl->wgl_context);
+      wglDeleteContext (context_wgl->wgl_context);
      context_wgl->wgl_context = NULL;
    }

@@ -628,7 +628,7 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context,
 static gboolean
 gdk_win32_gl_context_wgl_clear_current (GdkGLContext *context)
 {
-  return gdk_win32_private_wglMakeCurrent (NULL, NULL);
+  return wglMakeCurrent (NULL, NULL);
 }

 static gboolean
@@ -636,7 +636,7 @@ gdk_win32_gl_context_wgl_is_current (GdkGLContext *context)
 {
  GdkWin32GLContextWGL *self = GDK_WIN32_GL_CONTEXT_WGL (context);

-  return self->wgl_context == gdk_win32_private_wglGetCurrentContext ();
+  return self->wgl_context == wglGetCurrentContext ();
 }

 static gboolean
@@ -654,7 +654,7 @@ gdk_win32_gl_context_wgl_make_current (GdkGLContext *context,
  else
    hdc = GDK_WIN32_SURFACE (surface)->hdc;

-  if (!gdk_win32_private_wglMakeCurrent (hdc, context_wgl->wgl_context))
+  if (!wglMakeCurrent (hdc, context_wgl->wgl_context))
    return FALSE;

  if (!surfaceless && display_win32->hasWglEXTSwapControl)
@@ -21,7 +21,6 @@
 #ifndef __GDK_WIN32_GL_CONTEXT__
 #define __GDK_WIN32_GL_CONTEXT__

-#ifndef DONT_INCLUDE_LIBEPOXY
 #include <epoxy/gl.h>
 #include <epoxy/wgl.h>

@@ -32,18 +31,9 @@
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdksurface.h"
-#else
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# include <GL/gl.h>
-
-# include <glib.h>
-#endif

 G_BEGIN_DECLS

-#ifndef DONT_INCLUDE_LIBEPOXY
-
 #define GDK_WIN32_GL_CONTEXT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WIN32_GL_CONTEXT, GdkWin32GLContextClass))
 #define GDK_WIN32_GL_CONTEXT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_GL_CONTEXT, GdkWin32GLContextClass))
 #define GDK_WIN32_IS_GL_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_GL_CONTEXT))
@@ -88,13 +78,6 @@ GType     gdk_win32_gl_context_egl_get_type         (void) G_GNUC_CONST;
 void
 _gdk_win32_surface_invalidate_egl_framebuffer (GdkSurface *surface);

-#endif /* !DONT_INCLUDE_LIBEPOXY */
-
-HGLRC     gdk_win32_private_wglGetCurrentContext (void);
-BOOL      gdk_win32_private_wglMakeCurrent       (HDC hdc,
-                                                  HGLRC hglrc);
-void      gdk_win32_private_wglDeleteContext     (HGLRC hglrc);
-
 G_END_DECLS

 #endif /* __GDK_WIN32_GL_CONTEXT__ */
@@ -23,7 +23,6 @@ gdk_win32_sources = gdk_win32_public_sources + files([
  'gdkdevice-wintab.c',
  'gdkdrop-win32.c',
  'gdkglobals-win32.c',
-  'gdkglcontext-win32-wgl-private.c',
  'gdkhdataoutputstream-win32.c',
  'gdkinput-dmanipulation.c',
  'gdkinput-winpointer.c',
@@ -60,7 +59,6 @@ endif
 gdk_win32_deps = [
  pangowin32_dep, # FIXME
  cc.find_library('hid'),
-  cc.find_library('opengl32'),
 ]

 libgdk_win32 = static_library('gdk-win32',
@@ -488,7 +488,7 @@ gdk_x11_context_create_glx_context (GdkGLContext *context,

  /* We will use the default version matching the context status
   * unless the user requested a version which makes sense */
-  gdk_gl_context_get_matching_version (api, legacy,
+  gdk_gl_context_get_matching_version (api, legacy, 0,
                                       &min_major, &min_minor);
  gdk_gl_context_get_clipped_version (context, min_major, min_minor,
                                      &major, &minor);
@@ -1358,7 +1358,6 @@ gdk_x11_surface_destroy (GdkSurface *surface,

  unhook_surface_changed (surface);
  disconnect_frame_clock (surface);
-  g_clear_handle_id (&impl->compute_size_source_id, g_source_remove);

  if (impl->cairo_surface)
    {
@@ -1002,11 +1002,8 @@ gsk_gl_command_queue_execute (GskGLCommandQueue    *self,
  glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
  glBlendEquation (GL_FUNC_ADD);

-  if (!gdk_gl_context_get_use_es (self->context))
-    {
-      glGenVertexArrays (1, &vao_id);
-      glBindVertexArray (vao_id);
-    }
+  glGenVertexArrays (1, &vao_id);
+  glBindVertexArray (vao_id);

  vbo_id = gsk_gl_buffer_submit (&self->vertices);

@@ -1162,8 +1159,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue    *self,
    }

  glDeleteBuffers (1, &vbo_id);
-  if (!gdk_gl_context_get_use_es (self->context))
-    glDeleteVertexArrays (1, &vao_id);
+  glDeleteVertexArrays (1, &vao_id);

  gdk_profiler_set_int_counter (self->metrics.n_binds, n_binds);
  gdk_profiler_set_int_counter (self->metrics.n_uniforms, n_uniforms);
@@ -733,7 +733,7 @@ gsk_gl_driver_load_texture (GskGLDriver *self,

  format = GL_RGBA8;

-  if (GDK_IS_GL_TEXTURE (texture) && min_filter == GL_LINEAR && mag_filter == GL_LINEAR)
+  if (GDK_IS_GL_TEXTURE (texture))
    {
      GdkGLTexture *gl_texture = (GdkGLTexture *) texture;
      GdkGLContext *texture_context = gdk_gl_texture_get_context (gl_texture);
@@ -372,11 +372,7 @@ gsk_gl_renderer_render_texture (GskRenderer           *renderer,
      return texture;
    }

-  if (gsk_render_node_prefers_high_depth (root) &&
-      gdk_gl_context_check_version (self->context, 3, 0, 3, 0))
-    format = GL_RGBA32F;
-  else 
-    format = GL_RGBA8;
+  format = gsk_render_node_prefers_high_depth (root) ? GL_RGBA32F : GL_RGBA8;

  gdk_gl_context_make_current (self->context);

@@ -254,13 +254,12 @@ gsk_rounded_rect_shrink_to_minimum (GskRoundedRect *self)
 static inline gboolean G_GNUC_PURE
 node_supports_2d_transform (const GskRenderNode *node)
 {
-  switch (gsk_render_node_get_node_type (node))
+  switch ((int)gsk_render_node_get_node_type (node))
    {
    case GSK_COLOR_NODE:
    case GSK_OPACITY_NODE:
    case GSK_COLOR_MATRIX_NODE:
    case GSK_TEXTURE_NODE:
-    case GSK_TEXTURE_SCALE_NODE:
    case GSK_CROSS_FADE_NODE:
    case GSK_LINEAR_GRADIENT_NODE:
    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
@@ -272,7 +271,6 @@ node_supports_2d_transform (const GskRenderNode *node)
    case GSK_CAIRO_NODE:
    case GSK_BLEND_NODE:
    case GSK_BLUR_NODE:
-    case GSK_MASK_NODE:
      return TRUE;

    case GSK_SHADOW_NODE:
@@ -289,18 +287,8 @@ node_supports_2d_transform (const GskRenderNode *node)
        }
      return TRUE;

-    case GSK_BORDER_NODE:
-    case GSK_INSET_SHADOW_NODE:
-    case GSK_OUTSET_SHADOW_NODE:
-    case GSK_REPEAT_NODE:
-    case GSK_CLIP_NODE:
-    case GSK_ROUNDED_CLIP_NODE:
-    case GSK_GL_SHADER_NODE:
-      return FALSE;
-
-    case GSK_NOT_A_RENDER_NODE:
    default:
-      g_assert_not_reached ();
+      return FALSE;
    }
 }

@@ -314,7 +302,7 @@ node_supports_transform (const GskRenderNode *node)
   * opacity or color matrix.
   */

-  switch (gsk_render_node_get_node_type (node))
+  switch ((int)gsk_render_node_get_node_type (node))
    {
    case GSK_COLOR_NODE:
    case GSK_OPACITY_NODE:
@@ -326,7 +314,6 @@ node_supports_transform (const GskRenderNode *node)
    case GSK_CAIRO_NODE:
    case GSK_BLEND_NODE:
    case GSK_BLUR_NODE:
-    case GSK_MASK_NODE:
      return TRUE;

    case GSK_SHADOW_NODE:
@@ -335,25 +322,8 @@ node_supports_transform (const GskRenderNode *node)
    case GSK_TRANSFORM_NODE:
      return node_supports_transform (gsk_transform_node_get_child (node));

-    case GSK_CONTAINER_NODE:
-    case GSK_LINEAR_GRADIENT_NODE:
-    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
-    case GSK_RADIAL_GRADIENT_NODE:
-    case GSK_REPEATING_RADIAL_GRADIENT_NODE:
-    case GSK_CONIC_GRADIENT_NODE:
-    case GSK_BORDER_NODE:
-    case GSK_INSET_SHADOW_NODE:
-    case GSK_OUTSET_SHADOW_NODE:
-    case GSK_REPEAT_NODE:
-    case GSK_CLIP_NODE:
-    case GSK_ROUNDED_CLIP_NODE:
-    case GSK_GL_SHADER_NODE:
-    case GSK_TEXTURE_SCALE_NODE:
-      return FALSE;
-
-    case GSK_NOT_A_RENDER_NODE:
    default:
-      g_assert_not_reached ();
+      return FALSE;
    }
 }

@@ -563,21 +533,23 @@ extract_matrix_metadata (GskGLRenderModelview *modelview)
    case GSK_TRANSFORM_CATEGORY_ANY:
    case GSK_TRANSFORM_CATEGORY_3D:
      {
-        graphene_quaternion_t rotation;
-        graphene_vec4_t perspective;
-        graphene_vec3_t translation;
-        graphene_vec3_t scale;
-        graphene_vec3_t shear;
+        graphene_vec3_t col1;
+        graphene_vec3_t col2;

-        graphene_matrix_decompose (&modelview->matrix,
-                                   &translation,
-                                   &scale,
-                                   &rotation,
-                                   &shear,
-                                   &perspective);
+        /* TODO: 90% sure this is incorrect. But we should never hit this code
+         * path anyway. */
+        graphene_vec3_init (&col1,
+                            graphene_matrix_get_value (&modelview->matrix, 0, 0),
+                            graphene_matrix_get_value (&modelview->matrix, 1, 0),
+                            graphene_matrix_get_value (&modelview->matrix, 2, 0));

-        modelview->scale_x = graphene_vec3_get_x (&scale);
-        modelview->scale_y = graphene_vec3_get_y (&scale);
+        graphene_vec3_init (&col2,
+                            graphene_matrix_get_value (&modelview->matrix, 0, 1),
+                            graphene_matrix_get_value (&modelview->matrix, 1, 1),
+                            graphene_matrix_get_value (&modelview->matrix, 2, 1));
+
+        modelview->scale_x = graphene_vec3_length (&col1);
+        modelview->scale_y = graphene_vec3_length (&col2);
        modelview->dx = 0;
        modelview->dy = 0;
      }
@@ -900,21 +872,6 @@ gsk_gl_render_job_transform_bounds (GskGLRenderJob        *job,
    }
 }

-static inline void
-gsk_gl_render_job_untransform_bounds (GskGLRenderJob        *job,
-                                      const graphene_rect_t *rect,
-                                      graphene_rect_t       *out_rect)
-{
-  GskTransform *transform;
-
-  transform = gsk_transform_invert (gsk_transform_ref (job->current_modelview->transform));
-
-  gsk_transform_transform_bounds (transform, rect, out_rect);
-
-  out_rect->origin.x -= job->offset_x;
-  out_rect->origin.y -= job->offset_y;
-}
-
 static inline void
 gsk_gl_render_job_transform_rounded_rect (GskGLRenderJob       *job,
                                          const GskRoundedRect *rect,
@@ -3658,114 +3615,127 @@ gsk_gl_render_job_visit_texture_scale_node (GskGLRenderJob      *job,
  int min_filter = min_filters[scaling_filter];
  int mag_filter = mag_filters[scaling_filter];
  int max_texture_size = job->command_queue->max_texture_size;
-  graphene_rect_t clip_rect;
-  GskGLRenderTarget *render_target;
-  GskGLRenderOffscreen offscreen = {0};
-  graphene_rect_t viewport;
-  graphene_rect_t prev_viewport;
-  graphene_matrix_t prev_projection;
-  float prev_alpha;
-  guint prev_fbo;
-  guint texture_id;
-  float u0, u1, v0, v1;
-  GskTextureKey key;

-  gsk_gl_render_job_untransform_bounds (job, &job->current_clip->rect.bounds, &clip_rect);
-
-  if (!graphene_rect_intersection (bounds, &clip_rect, &clip_rect))
-    return;
-
-  if G_UNLIKELY (clip_rect.size.width > max_texture_size ||
-                 clip_rect.size.height > max_texture_size)
+  if (scaling_filter == GSK_SCALING_FILTER_LINEAR)
    {
      gsk_gl_render_job_visit_texture (job, texture, bounds);
      return;
    }

-  key.pointer = node;
-  key.pointer_is_child = TRUE;
-  key.parent_rect = clip_rect;
-  key.scale_x = 1.;
-  key.scale_y = 1.;
-  key.filter = min_filter;
-
-  texture_id = gsk_gl_driver_lookup_texture (job->driver, &key);
-  if (texture_id != 0)
-    goto render_texture;
-
-  viewport = GRAPHENE_RECT_INIT (0, 0,
-                                 clip_rect.size.width,
-                                 clip_rect.size.height);
-
-  if (!gsk_gl_driver_create_render_target (job->driver,
-                                           (int) ceilf (clip_rect.size.width),
-                                           (int) ceilf (clip_rect.size.height),
-                                           get_target_format (job, node),
-                                           GL_LINEAR, GL_LINEAR,
-                                           &render_target))
+  if G_LIKELY (texture->width <= max_texture_size &&
+               texture->height <= max_texture_size)
    {
-      gsk_gl_render_job_visit_texture (job, texture, bounds);
-      return;
+      GskGLRenderTarget *render_target;
+      GskGLRenderOffscreen offscreen = {0};
+      graphene_rect_t viewport;
+      graphene_rect_t prev_viewport;
+      graphene_matrix_t prev_projection;
+      float prev_alpha;
+      guint prev_fbo;
+      guint texture_id;
+
+      viewport = GRAPHENE_RECT_INIT (0, 0,
+                                     bounds->size.width,
+                                     bounds->size.height);
+
+      if (!gsk_gl_driver_create_render_target (job->driver,
+                                               (int) ceilf (viewport.size.width),
+                                               (int) ceilf (viewport.size.height),
+                                               get_target_format (job, node),
+                                               GL_LINEAR, GL_LINEAR,
+                                               &render_target))
+        {
+          /* viewport is too big, slice the texture and try again */
+          goto slice;
+        }
+
+      gsk_gl_render_job_upload_texture (job, texture, min_filter, mag_filter, &offscreen);
+
+      g_assert (offscreen.texture_id);
+      g_assert (offscreen.was_offscreen == FALSE);
+
+      gsk_gl_render_job_set_viewport (job, &viewport, &prev_viewport);
+      gsk_gl_render_job_set_projection_from_rect (job, &viewport, &prev_projection);
+      gsk_gl_render_job_set_modelview (job, NULL);
+      prev_alpha = gsk_gl_render_job_set_alpha (job, 1.0f);
+      gsk_gl_render_job_push_clip (job, &GSK_ROUNDED_RECT_INIT_FROM_RECT (viewport));
+
+      prev_fbo = gsk_gl_command_queue_bind_framebuffer (job->command_queue, render_target->framebuffer_id);
+      gsk_gl_command_queue_clear (job->command_queue, 0, &viewport);
+
+      gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));
+      gsk_gl_program_set_uniform_texture (job->current_program,
+                                          UNIFORM_SHARED_SOURCE, 0,
+                                          GL_TEXTURE_2D,
+                                          GL_TEXTURE0,
+                                          offscreen.texture_id);
+      gsk_gl_render_job_draw_offscreen (job, &viewport, &offscreen);
+      gsk_gl_render_job_end_draw (job);
+
+      gsk_gl_render_job_pop_clip (job);
+      gsk_gl_render_job_pop_modelview (job);
+      gsk_gl_render_job_set_viewport (job, &prev_viewport, NULL);
+      gsk_gl_render_job_set_projection (job, &prev_projection);
+      gsk_gl_render_job_set_alpha (job, prev_alpha);
+      gsk_gl_command_queue_bind_framebuffer (job->command_queue, prev_fbo);
+
+      texture_id = gsk_gl_driver_release_render_target (job->driver, render_target, FALSE);
+
+      gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));
+      gsk_gl_program_set_uniform_texture (job->current_program,
+                                          UNIFORM_SHARED_SOURCE, 0,
+                                          GL_TEXTURE_2D,
+                                          GL_TEXTURE0,
+                                          texture_id);
+      gsk_gl_render_job_draw_offscreen_rect (job, bounds);
+      gsk_gl_render_job_end_draw (job);
    }
+  else
+slice:
+    {
+      float min_x = bounds->origin.x;
+      float min_y = bounds->origin.y;
+      float max_x = min_x + bounds->size.width;
+      float max_y = min_y + bounds->size.height;
+      float scale_x = (max_x - min_x) / texture->width;
+      float scale_y = (max_y - min_y) / texture->height;
+      GskGLTextureSlice *slices = NULL;
+      guint n_slices = 0;
+      GdkGLContext *context = gsk_gl_driver_get_context (job->driver);
+      guint rows, cols;

-  gsk_gl_render_job_upload_texture (job, texture, min_filter, mag_filter, &offscreen);
+      /* Slice enough that neither the original texture nor the scaled texture
+       * exceed the texture size limit
+       */
+      cols = (int)(MAX (bounds->size.width, texture->width) / (max_texture_size / 4)) + 1;
+      rows = (int)(MAX (bounds->size.height, texture->height) / (max_texture_size / 4)) + 1;

-  g_assert (offscreen.texture_id);
-  g_assert (offscreen.was_offscreen == FALSE);
+      gsk_gl_driver_slice_texture (job->driver, texture, GL_NEAREST, GL_NEAREST, cols, rows, &slices, &n_slices);

-  u0 = (clip_rect.origin.x - bounds->origin.x) / bounds->size.width;
-  v0 = (clip_rect.origin.y - bounds->origin.y) / bounds->size.height;
-  u1 = (clip_rect.origin.x + clip_rect.size.width - bounds->origin.x) / bounds->size.width;
-  v1 = (clip_rect.origin.y + clip_rect.size.height - bounds->origin.y) / bounds->size.height;
+      g_assert (slices != NULL);
+      g_assert (n_slices > 0);

-  gsk_gl_render_job_set_viewport (job, &viewport, &prev_viewport);
-  gsk_gl_render_job_set_projection_from_rect (job, &viewport, &prev_projection);
-  gsk_gl_render_job_set_modelview (job, NULL);
-  prev_alpha = gsk_gl_render_job_set_alpha (job, 1.0f);
-  gsk_gl_render_job_push_clip (job, &GSK_ROUNDED_RECT_INIT_FROM_RECT (viewport));
+      for (guint i = 0; i < n_slices; i ++)
+        {
+          const GskGLTextureSlice *slice = &slices[i];
+          float x1, x2, y1, y2;
+          GdkTexture *sub_texture;
+          GskRenderNode *sub_node;

-  prev_fbo = gsk_gl_command_queue_bind_framebuffer (job->command_queue, render_target->framebuffer_id);
-  gsk_gl_command_queue_clear (job->command_queue, 0, &viewport);
+          x1 = min_x + (scale_x * slice->rect.x);
+          x2 = x1 + (slice->rect.width * scale_x);
+          y1 = min_y + (scale_y * slice->rect.y);
+          y2 = y1 + (slice->rect.height * scale_y);

-  gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));
-  gsk_gl_program_set_uniform_texture (job->current_program,
-                                      UNIFORM_SHARED_SOURCE, 0,
-                                      GL_TEXTURE_2D,
-                                      GL_TEXTURE0,
-                                      offscreen.texture_id);
-  gsk_gl_render_job_draw_coords (job,
-                                 0, 0, clip_rect.size.width, clip_rect.size.height,
-                                 u0, v0, u1, v1,
-                                 (guint16[]) { FP16_ZERO, FP16_ZERO, FP16_ZERO, FP16_ZERO });
-  gsk_gl_render_job_end_draw (job);
+          sub_texture = gdk_gl_texture_new (context, slice->texture_id, slice->rect.width, slice->rect.height, NULL, NULL);

-  gsk_gl_render_job_pop_clip (job);
-  gsk_gl_render_job_pop_modelview (job);
-  gsk_gl_render_job_set_viewport (job, &prev_viewport, NULL);
-  gsk_gl_render_job_set_projection (job, &prev_projection);
-  gsk_gl_render_job_set_alpha (job, prev_alpha);
-  gsk_gl_command_queue_bind_framebuffer (job->command_queue, prev_fbo);
+          sub_node = gsk_texture_scale_node_new (sub_texture, &GRAPHENE_RECT_INIT (x1, y1, x2 - x1, y2 - y1), scaling_filter);

-  texture_id = gsk_gl_driver_release_render_target (job->driver, render_target, FALSE);
-
-  gsk_gl_driver_cache_texture (job->driver, &key, texture_id);
-
-render_texture:
-  gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));
-  gsk_gl_program_set_uniform_texture (job->current_program,
-                                      UNIFORM_SHARED_SOURCE, 0,
-                                      GL_TEXTURE_2D,
-                                      GL_TEXTURE0,
-                                      texture_id);
-  gsk_gl_render_job_draw_coords (job,
-                                 job->offset_x + clip_rect.origin.x,
-                                 job->offset_y + clip_rect.origin.y,
-                                 job->offset_x + clip_rect.origin.x + clip_rect.size.width,
-                                 job->offset_y + clip_rect.origin.y + clip_rect.size.height,
-                                 0, clip_rect.size.width / ceilf (clip_rect.size.width),
-                                 clip_rect.size.height / ceilf (clip_rect.size.height), 0,
-                                 (guint16[]){ FP16_ZERO, FP16_ZERO, FP16_ZERO, FP16_ZERO } );
-  gsk_gl_render_job_end_draw (job);
+          gsk_gl_render_job_visit_node (job, sub_node);
+          gsk_render_node_unref (sub_node);
+          g_object_unref (sub_texture);
+        }
+    }
 }

 static inline void
@@ -21,10 +21,8 @@
 #include "gskrendernodeprivate.h"

 #include "gskcairoblurprivate.h"
-#include "gskcairorenderer.h"
 #include "gskdebugprivate.h"
 #include "gskdiffprivate.h"
-#include "gl/gskglrenderer.h"
 #include "gskrendererprivate.h"
 #include "gskroundedrectprivate.h"
 #include "gsktransformprivate.h"
@@ -33,10 +31,6 @@
 #include "gdk/gdkmemoryformatprivate.h"
 #include "gdk/gdkprivate.h"

-#include <cairo.h>
-#ifdef CAIRO_HAS_SVG_SURFACE
-#include <cairo-svg.h>
-#endif
 #include <hb-ot.h>

 /* maximal number of rectangles we keep in a diff region before we throw
@@ -64,16 +58,6 @@ rectangle_init_from_graphene (cairo_rectangle_int_t *cairo,
  cairo->height = ceilf (graphene->origin.y + graphene->size.height) - cairo->y;
 }

-static void
-_graphene_rect_init_from_clip_extents (graphene_rect_t *rect,
-                                       cairo_t         *cr)
-{
-  double x1c, y1c, x2c, y2c;
-
-  cairo_clip_extents (cr, &x1c, &y1c, &x2c, &y2c);
-  graphene_rect_init (rect, x1c, y1c, x2c - x1c, y2c - y1c);
-}
-
 /* {{{ GSK_COLOR_NODE */

 /**
@@ -1573,10 +1557,6 @@ gsk_texture_node_get_texture (const GskRenderNode *node)
 * Creates a `GskRenderNode` that will render the given
 * @texture into the area given by @bounds.
 *
- * Note that GSK applies linear filtering when textures are
- * scaled and transformed. See [class@Gsk.TextureScaleNode]
- * for a way to influence filtering.
- *
 * Returns: (transfer full) (type GskTextureNode): A new `GskRenderNode`
 */
 GskRenderNode *
@@ -1645,21 +1625,15 @@ gsk_texture_scale_node_draw (GskRenderNode *node,
  };
  cairo_t *cr2;
  cairo_surface_t *surface2;
-  graphene_rect_t clip_rect;
-
-  /* Make sure we draw the minimum region by using the clip */
-  gsk_cairo_rectangle (cr, &node->bounds);
-  cairo_clip (cr);
-  _graphene_rect_init_from_clip_extents (&clip_rect, cr);
-  if (clip_rect.size.width <= 0 || clip_rect.size.height <= 0)
-    return;

  surface2 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                         (int) ceilf (clip_rect.size.width),
-                                         (int) ceilf (clip_rect.size.height));
-  cairo_surface_set_device_offset (surface2, -clip_rect.origin.x, -clip_rect.origin.y);
+                                         (int) ceilf (node->bounds.size.width),
+                                         (int) ceilf (node->bounds.size.height));
  cr2 = cairo_create (surface2);

+  cairo_set_source_rgba (cr2, 0, 0, 0, 0);
+  cairo_paint (cr2);
+
  surface = gdk_texture_download_surface (self->texture);
  pattern = cairo_pattern_create_for_surface (surface);
  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
@@ -1758,11 +1732,7 @@ gsk_texture_scale_node_get_filter (const GskRenderNode *node)
 * @filter: how to scale the texture
 *
 * Creates a node that scales the texture to the size given by the
- * bounds using the filter and then places it at the bounds' position.
- *
- * Note that further scaling and other transformations which are
- * applied to the node will apply linear filtering to the resulting
- * texture, as usual.
+ * bounds and the filter and then places it at the bounds' position.
 *
 * This node is intended for tight control over scaling applied
 * to a texture, such as in image editors and requires the
@@ -2102,15 +2072,15 @@ gsk_inset_shadow_node_draw (GskRenderNode *node,
  GskInsetShadowNode *self = (GskInsetShadowNode *) node;
  GskRoundedRect box, clip_box;
  int clip_radius;
-  graphene_rect_t clip_rect;
+  double x1c, y1c, x2c, y2c;
  double blur_radius;

  /* We don't need to draw invisible shadows */
  if (gdk_rgba_is_clear (&self->color))
    return;

-  _graphene_rect_init_from_clip_extents (&clip_rect, cr);
-  if (!gsk_rounded_rect_intersects_rect (&self->outline, &clip_rect))
+  cairo_clip_extents (cr, &x1c, &y1c, &x2c, &y2c);
+  if (!gsk_rounded_rect_intersects_rect (&self->outline, &GRAPHENE_RECT_INIT (x1c, y1c, x2c - x1c, y2c - y1c)))
    return;

  blur_radius = self->blur_radius / 2;
@@ -2398,7 +2368,7 @@ gsk_outset_shadow_node_draw (GskRenderNode *node,
  GskOutsetShadowNode *self = (GskOutsetShadowNode *) node;
  GskRoundedRect box, clip_box;
  int clip_radius;
-  graphene_rect_t clip_rect;
+  double x1c, y1c, x2c, y2c;
  float top, right, bottom, left;
  double blur_radius;

@@ -2406,8 +2376,8 @@ gsk_outset_shadow_node_draw (GskRenderNode *node,
  if (gdk_rgba_is_clear (&self->color))
    return;

-  _graphene_rect_init_from_clip_extents (&clip_rect, cr);
-  if (!gsk_rounded_rect_intersects_rect (&self->outline, &clip_rect))
+  cairo_clip_extents (cr, &x1c, &y1c, &x2c, &y2c);
+  if (gsk_rounded_rect_contains_rect (&self->outline, &GRAPHENE_RECT_INIT (x1c, y1c, x2c - x1c, y2c - y1c)))
    return;

  blur_radius = self->blur_radius / 2;
@@ -6241,9 +6211,9 @@ gsk_render_node_init_types_once (void)
 }

 static void
-gsk_render_node_serialize_bytes_finish (GObject      *source,
-                                        GAsyncResult *result,
-                                        gpointer      serializer)
+gsk_render_node_content_serializer_finish (GObject      *source,
+                                           GAsyncResult *result,
+                                           gpointer      serializer)
 {
  GOutputStream *stream = G_OUTPUT_STREAM (source);
  GError *error = NULL;
@@ -6254,109 +6224,10 @@ gsk_render_node_serialize_bytes_finish (GObject      *source,
    gdk_content_serializer_return_success (serializer);
 }

-static void
-gsk_render_node_serialize_bytes (GdkContentSerializer *serializer,
-                                 GBytes               *bytes)
-{
-  GInputStream *input;
-
-  input = g_memory_input_stream_new_from_bytes (bytes);
-
-  g_output_stream_splice_async (gdk_content_serializer_get_output_stream (serializer),
-                                input,
-                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
-                                gdk_content_serializer_get_priority (serializer),
-                                gdk_content_serializer_get_cancellable (serializer),
-                                gsk_render_node_serialize_bytes_finish,
-                                serializer);
-  g_object_unref (input);
-  g_bytes_unref (bytes);
-}
-
-#ifdef CAIRO_HAS_SVG_SURFACE
-static cairo_status_t
-gsk_render_node_cairo_serializer_write (gpointer             user_data,
-                                        const unsigned char *data,
-                                        unsigned int         length)
-{
-  g_byte_array_append (user_data, data, length);
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-gsk_render_node_svg_serializer (GdkContentSerializer *serializer)
-{
-  GskRenderNode *node;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  graphene_rect_t bounds;
-  GByteArray *array;
-
-  node = gsk_value_get_render_node (gdk_content_serializer_get_value (serializer));
-  gsk_render_node_get_bounds (node, &bounds);
-  array = g_byte_array_new ();
-
-  surface = cairo_svg_surface_create_for_stream (gsk_render_node_cairo_serializer_write,
-                                                 array,
-                                                 bounds.size.width,
-                                                 bounds.size.height);
-  cairo_svg_surface_set_document_unit (surface, CAIRO_SVG_UNIT_PX);
-  cairo_surface_set_device_offset (surface, -bounds.origin.x, -bounds.origin.y);
-
-  cr = cairo_create (surface);
-  gsk_render_node_draw (node, cr);
-  cairo_destroy (cr);
-
-  cairo_surface_finish (surface);
-  if (cairo_surface_status (surface) == CAIRO_STATUS_SUCCESS)
-    {
-      gsk_render_node_serialize_bytes (serializer, g_byte_array_free_to_bytes (array));
-    }
-  else
-    {
-      GError *error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_FAILED,
-                                           cairo_status_to_string (cairo_surface_status (surface)));
-      gdk_content_serializer_return_error (serializer, error);
-      g_byte_array_unref (array);
-    }
-  cairo_surface_destroy (surface);
-}
-#endif
-
-static void
-gsk_render_node_png_serializer (GdkContentSerializer *serializer)
-{
-  GskRenderNode *node;
-  GdkTexture *texture;
-  GskRenderer *renderer;
-  GBytes *bytes;
-
-  node = gsk_value_get_render_node (gdk_content_serializer_get_value (serializer));
-
-  renderer = gsk_gl_renderer_new ();
-  if (!gsk_renderer_realize (renderer, NULL, NULL))
-    {
-      g_object_unref (renderer);
-      renderer = gsk_cairo_renderer_new ();
-      if (!gsk_renderer_realize (renderer, NULL, NULL))
-        {
-          g_assert_not_reached ();
-        }
-    }
-  texture = gsk_renderer_render_texture (renderer, node, NULL);
-  gsk_renderer_unrealize (renderer);
-  g_object_unref (renderer);
-
-  bytes = gdk_texture_save_to_png_bytes (texture);
-  g_object_unref (texture);
-
-  gsk_render_node_serialize_bytes (serializer, bytes);
-}
-
 static void
 gsk_render_node_content_serializer (GdkContentSerializer *serializer)
 {
+  GInputStream *input;
  const GValue *value;
  GskRenderNode *node;
  GBytes *bytes;
@@ -6364,14 +6235,23 @@ gsk_render_node_content_serializer (GdkContentSerializer *serializer)
  value = gdk_content_serializer_get_value (serializer);
  node = gsk_value_get_render_node (value);
  bytes = gsk_render_node_serialize (node);
+  input = g_memory_input_stream_new_from_bytes (bytes);

-  gsk_render_node_serialize_bytes (serializer, bytes);
+  g_output_stream_splice_async (gdk_content_serializer_get_output_stream (serializer),
+                                input,
+                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
+                                gdk_content_serializer_get_priority (serializer),
+                                gdk_content_serializer_get_cancellable (serializer),
+                                gsk_render_node_content_serializer_finish,
+                                serializer);
+  g_object_unref (input);
+  g_bytes_unref (bytes);
 }

 static void
 gsk_render_node_content_deserializer_finish (GObject      *source,
-                                             GAsyncResult *result,
-                                             gpointer      deserializer)
+                              GAsyncResult *result,
+                              gpointer      deserializer)
 {
  GOutputStream *stream = G_OUTPUT_STREAM (source);
  GError *error = NULL;
@@ -6435,18 +6315,6 @@ gsk_render_node_init_content_serializers (void)
                                   gsk_render_node_content_serializer,
                                   NULL,
                                   NULL);
-#ifdef CAIRO_HAS_SVG_SURFACE
-  gdk_content_register_serializer (GSK_TYPE_RENDER_NODE,
-                                   "image/svg+xml",
-                                   gsk_render_node_svg_serializer,
-                                   NULL,
-                                   NULL);
-#endif
-  gdk_content_register_serializer (GSK_TYPE_RENDER_NODE,
-                                   "image/png",
-                                   gsk_render_node_png_serializer,
-                                   NULL,
-                                   NULL);

  gdk_content_register_deserializer ("application/x-gtk-render-node",
                                     GSK_TYPE_RENDER_NODE,
@@ -128,10 +128,6 @@ parse_texture (GtkCssParser *parser,
        }
      else
        {
-          g_set_error (&error,
-                       GTK_CSS_PARSER_ERROR,
-                       GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE,
-                       "Failed to resolve URL");
          texture = NULL;
        }
    }
@@ -233,19 +229,8 @@ parse_script (GtkCssParser *parser,
      GFile *file;

      file = gtk_css_parser_resolve_url (parser, url);
-      if (file)
-        {
-          bytes = g_file_load_bytes (file, NULL, NULL, &error);
-          g_object_unref (file);
-        }
-      else
-        {
-          g_set_error (&error,
-                       GTK_CSS_PARSER_ERROR,
-                       GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE,
-                       "Failed to resolve URL");
-          bytes = NULL;
-        }
+      bytes = g_file_load_bytes (file, NULL, NULL, &error);
+      g_object_unref (file);
    }

  g_free (scheme);
@@ -431,10 +416,7 @@ parse_string (GtkCssParser *parser,

  token = gtk_css_parser_get_token (parser);
  if (!gtk_css_token_is (token, GTK_CSS_TOKEN_STRING))
-    {
-      gtk_css_parser_error_syntax (parser, "Expected a string");
-      return FALSE;
-    }
+    return FALSE;

  s = g_strdup (gtk_css_token_get_string (token));
  gtk_css_parser_consume_token (parser);
@@ -164,7 +164,7 @@ gskenum_h = gsk_enums[1]
 gskresources = gnome.compile_resources('gskresources',
  gsk_resources_xml,
  dependencies: gsk_private_vulkan_compiled_shaders_deps,
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
  c_name: '_gsk',
  extra_args: [ '--manual-register', ],
 )
@@ -158,12 +158,9 @@ component_handle_method (GDBusConnection       *connection,
        }
      else
        {
-          GtkATContext *context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
-          GtkAtSpiContext *ctx = GTK_AT_SPI_CONTEXT (context);
+          GtkAtSpiContext *ctx = GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (child)));

          g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (ctx)));
-
-          g_object_unref (context);
        }
    }
  else if (g_strcmp0 (method_name, "GetExtents") == 0)
@@ -142,10 +142,10 @@ collect_states (GtkAtSpiContext    *self,
  accessible = gtk_at_context_get_accessible (ctx);

  set_atspi_state (&states, ATSPI_STATE_VISIBLE);
-  set_atspi_state (&states, ATSPI_STATE_SHOWING);

  if (ctx->accessible_role == GTK_ACCESSIBLE_ROLE_WINDOW)
    {
+      set_atspi_state (&states, ATSPI_STATE_SHOWING);
      if (gtk_accessible_get_platform_state (accessible, GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE))
        set_atspi_state (&states, ATSPI_STATE_ACTIVE);
    }
@@ -203,7 +203,6 @@ collect_states (GtkAtSpiContext    *self,

  if (gtk_at_context_has_accessible_state (ctx, GTK_ACCESSIBLE_STATE_CHECKED))
    {
-      set_atspi_state (&states, ATSPI_STATE_CHECKABLE);
      value = gtk_at_context_get_accessible_state (ctx, GTK_ACCESSIBLE_STATE_CHECKED);
      switch (gtk_tristate_accessible_value_get (value))
        {
@@ -247,7 +246,7 @@ collect_states (GtkAtSpiContext    *self,
        case GTK_ACCESSIBLE_INVALID_TRUE:
        case GTK_ACCESSIBLE_INVALID_GRAMMAR:
        case GTK_ACCESSIBLE_INVALID_SPELLING:
-          set_atspi_state (&states, ATSPI_STATE_INVALID_ENTRY);
+          set_atspi_state (&states, ATSPI_STATE_INVALID);
          break;
        case GTK_ACCESSIBLE_INVALID_FALSE:
        default:
@@ -283,34 +282,6 @@ collect_states (GtkAtSpiContext    *self,
        }
    }

-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_REQUIRED))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_REQUIRED);
-      if (gtk_boolean_accessible_value_get (value))
-        set_atspi_state (&states, ATSPI_STATE_REQUIRED);
-    }
-
-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE);
-      if (gtk_boolean_accessible_value_get (value))
-        set_atspi_state (&states, ATSPI_STATE_MULTISELECTABLE);
-    }
-
-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_HAS_POPUP))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_HAS_POPUP);
-      if (gtk_boolean_accessible_value_get (value))
-        set_atspi_state (&states, ATSPI_STATE_HAS_POPUP);
-    }
-
-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE);
-      if (gtk_autocomplete_accessible_value_get (value) != GTK_ACCESSIBLE_AUTOCOMPLETE_NONE)
-        set_atspi_state (&states, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION);
-    }
-
  g_variant_builder_add (builder, "u", (guint32) (states & 0xffffffff));
  g_variant_builder_add (builder, "u", (guint32) (states >> 32));
 }
@@ -328,12 +299,11 @@ collect_relations (GtkAtSpiContext *self,
    { GTK_ACCESSIBLE_RELATION_LABELLED_BY, ATSPI_RELATION_LABELLED_BY },
    { GTK_ACCESSIBLE_RELATION_CONTROLS, ATSPI_RELATION_CONTROLLER_FOR },
    { GTK_ACCESSIBLE_RELATION_DESCRIBED_BY, ATSPI_RELATION_DESCRIBED_BY },
-    { GTK_ACCESSIBLE_RELATION_DETAILS, ATSPI_RELATION_DETAILS },
-    { GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, ATSPI_RELATION_ERROR_MESSAGE},
    { GTK_ACCESSIBLE_RELATION_FLOW_TO, ATSPI_RELATION_FLOWS_TO},
  };
  GtkAccessibleValue *value;
  GList *list, *l;
+  GtkATContext *target_ctx;
  int i;

  for (i = 0; i < G_N_ELEMENTS (map); i++)
@@ -348,16 +318,13 @@ collect_relations (GtkAtSpiContext *self,

      for (l = list; l; l = l->next)
        {
-          GtkATContext *target_ctx =
-            gtk_accessible_get_at_context (GTK_ACCESSIBLE (l->data));
+          target_ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (l->data));

          /* Realize the ATContext of the target, so we can ask for its ref */
          gtk_at_context_realize (target_ctx);

          g_variant_builder_add (&b, "@(so)",
                                 gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (target_ctx)));
-
-          g_object_unref (target_ctx);
        }

      g_variant_builder_add (builder, "(ua(so))", map[i].s, &b);
@@ -369,17 +336,17 @@ static int
 get_index_in (GtkAccessible *parent,
              GtkAccessible *child)
 {
+  GtkAccessible *candidate;
+  guint res;
+
  if (parent == NULL)
    return -1;

-  guint res = 0;
-  GtkAccessible *candidate;
+  res = 0;
  for (candidate = gtk_accessible_get_first_accessible_child (parent);
       candidate != NULL;
       candidate = gtk_accessible_get_next_accessible_sibling (candidate))
    {
-      g_object_unref (candidate);
-
      if (candidate == child)
        return res;

@@ -398,13 +365,7 @@ get_index_in_parent (GtkAccessible *accessible)
  GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);

  if (parent != NULL)
-    {
-      int res = get_index_in (parent, accessible);
-
-      g_object_unref (parent);
-
-      return res;
-    }
+    return get_index_in (parent, accessible);

  return -1;
 }
@@ -440,6 +401,7 @@ static GVariant *
 get_parent_context_ref (GtkAccessible *accessible)
 {
  GVariant *res = NULL;
+
  GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);

  if (parent == NULL)
@@ -448,19 +410,13 @@ get_parent_context_ref (GtkAccessible *accessible)
      GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (context);

      res = gtk_at_spi_root_to_ref (self->root);
-
-      g_object_unref (context);
    }
  else
    {
      GtkATContext *parent_context = gtk_accessible_get_at_context (parent);
-
      gtk_at_context_realize (parent_context);

      res = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (parent_context));
-
-      g_object_unref (parent_context);
-      g_object_unref (parent);
    }

  if (res == NULL)
@@ -541,32 +497,31 @@ handle_accessible_method (GDBusConnection       *connection,
    {
      GtkATContext *context = NULL;
      GtkAccessible *accessible;
-      GtkAccessible *child = NULL;
      int idx, presentable_idx;

      g_variant_get (parameters, "(i)", &idx);

      accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));

-      presentable_idx = 0;
+      GtkAccessible *child;

+      presentable_idx = 0;
      for (child = gtk_accessible_get_first_accessible_child (accessible);
           child != NULL;
           child = gtk_accessible_get_next_accessible_sibling (child))
        {
-          g_object_unref (child);
-
          if (!gtk_accessible_should_present (child))
-            continue;
+              continue;

          if (presentable_idx == idx)
            break;
+          presentable_idx++;

-          presentable_idx += 1;
        }
-
-      if (child != NULL)
-        context = gtk_accessible_get_at_context (child);
+      if (child)
+        {
+          context = gtk_accessible_get_at_context (child);
+        }

      if (context == NULL)
        {
@@ -581,23 +536,20 @@ handle_accessible_method (GDBusConnection       *connection,
      gtk_at_context_realize (context);

      GVariant *ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
-      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", ref));

-      g_object_unref (context);
+      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", ref));
    }
  else if (g_strcmp0 (method_name, "GetChildren") == 0)
    {
      GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a(so)"));

      GtkAccessible *accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
-      GtkAccessible *child = NULL;

+      GtkAccessible *child;
      for (child = gtk_accessible_get_first_accessible_child (accessible);
           child != NULL;
           child = gtk_accessible_get_next_accessible_sibling (child))
-        {
-          g_object_unref (child);
-
+      {
          if (!gtk_accessible_should_present (child))
            continue;

@@ -610,8 +562,6 @@ handle_accessible_method (GDBusConnection       *connection,

          if (ref != NULL)
            g_variant_builder_add (&builder, "@(so)", ref);
-
-          g_object_unref (context);
        }

      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a(so))", &builder));
@@ -791,13 +741,8 @@ emit_property_changed (GtkAtSpiContext *self,
                       const char      *name,
                       GVariant        *value)
 {
-  GVariant *value_owned = g_variant_ref_sink (value);
-
  if (self->connection == NULL)
-    {
-      g_variant_unref (value_owned);
-      return;
-    }
+    return;

  g_dbus_connection_emit_signal (self->connection,
                                 NULL,
@@ -805,9 +750,8 @@ emit_property_changed (GtkAtSpiContext *self,
                                 "org.a11y.atspi.Event.Object",
                                 "PropertyChange",
                                 g_variant_new ("(siiva{sv})",
-                                                name, 0, 0, value_owned, NULL),
+                                                name, 0, 0, value, NULL),
                                 NULL);
-  g_variant_unref (value_owned);
 }

 static void
@@ -906,6 +850,8 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,

  if (changed_states & GTK_ACCESSIBLE_STATE_CHANGE_HIDDEN)
    {
+      GtkAccessible *parent;
+      GtkATContext *context;
      GtkAccessibleChildChange change;

      value = gtk_accessible_attribute_set_get_value (states, GTK_ACCESSIBLE_STATE_HIDDEN);
@@ -918,19 +864,13 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,
        {
          gtk_at_spi_root_child_changed (self->root, change, accessible);
          emit_state_changed (self, "showing", gtk_boolean_accessible_value_get (value));
-          emit_state_changed (self, "visible", gtk_boolean_accessible_value_get (value));
        }
      else
        {
-          GtkAccessible *parent =
-            gtk_accessible_get_accessible_parent (accessible);
-          GtkATContext *context =
-            gtk_accessible_get_at_context (parent);
+          parent = gtk_accessible_get_accessible_parent (accessible);

+          context = gtk_accessible_get_at_context (parent);
          gtk_at_context_child_changed (context, change, accessible);
-
-          g_object_unref (context);
-          g_object_unref (parent);
        }
    }

@@ -1097,18 +1037,10 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,
    }

  if (changed_properties & GTK_ACCESSIBLE_PROPERTY_CHANGE_DESCRIPTION)
-  {
-      char *label = gtk_at_context_get_description (GTK_AT_CONTEXT (self));                                            
-      GVariant *v = g_variant_new_take_string (label);                                                                 
-      emit_property_changed (self, "accessible-description", v);
-    }
-
-  if (changed_properties & GTK_ACCESSIBLE_PROPERTY_CHANGE_VALUE_NOW)
    {
-      value = gtk_accessible_attribute_set_get_value (properties, GTK_ACCESSIBLE_PROPERTY_VALUE_NOW);
-      emit_property_changed (self,
-                             "accessible-value",
-                             g_variant_new_double (gtk_number_accessible_value_get (value)));
+      char *label = gtk_at_context_get_description (GTK_AT_CONTEXT (self));
+      GVariant *v = g_variant_new_take_string (label);
+      emit_property_changed (self, "accessible-description", v);
    }
 }

@@ -1187,18 +1119,9 @@ gtk_at_spi_context_child_change (GtkATContext             *ctx,
  int idx = 0;

  if (parent == NULL)
-    {
-      idx = -1;
-    }
+    idx = -1;
  else if (parent == accessible)
-    {
-      idx = get_index_in (accessible, child);
-      g_object_unref (parent);
-    }
-  else
-    {
-      g_object_unref (parent);
-    }
+    idx = get_index_in (accessible, child);

  if (change & GTK_ACCESSIBLE_CHILD_CHANGE_ADDED)
    emit_children_changed (self,
@@ -1210,8 +1133,6 @@ gtk_at_spi_context_child_change (GtkATContext             *ctx,
                           GTK_AT_SPI_CONTEXT (child_context),
                           idx,
                           GTK_ACCESSIBLE_CHILD_STATE_REMOVED);
-
-  g_object_unref (child_context);
 }
 /* }}} */
 /* {{{ D-Bus Registration */
@@ -1780,16 +1701,15 @@ gtk_at_spi_context_get_child_count (GtkAtSpiContext *self)
  int n_children = 0;

  GtkAccessible *child = NULL;
+
  for (child = gtk_accessible_get_first_accessible_child (accessible);
       child != NULL;
       child = gtk_accessible_get_next_accessible_sibling (child))
    {
-      g_object_unref (child);
-
      if (!gtk_accessible_should_present (child))
        continue;

-      n_children += 1;
+      n_children++;
    }

  return n_children;
@@ -225,10 +225,6 @@ typedef enum {
  ATSPI_RELATION_PARENT_WINDOW_OF,
  ATSPI_RELATION_DESCRIPTION_FOR,
  ATSPI_RELATION_DESCRIBED_BY,
-  ATSPI_RELATION_DETAILS,
-  ATSPI_RELATION_DETAILS_FOR,
-  ATSPI_RELATION_ERROR_MESSAGE,
-  ATSPI_RELATION_ERROR_FOR,
  ATSPI_RELATION_LAST_DEFINED,
 } AtspiRelationType;

@@ -314,8 +314,6 @@ handle_accessible_method (GDBusConnection       *connection,
      const char *path = gtk_at_spi_context_get_context_path (GTK_AT_SPI_CONTEXT (context));

      g_dbus_method_invocation_return_value (invocation, g_variant_new ("((so))", name, path));
-
-      g_object_unref (context);
    }
  else if (g_strcmp0 (method_name, "GetChildren") == 0)
    {
@@ -336,8 +334,6 @@ handle_accessible_method (GDBusConnection       *connection,
          const char *path = gtk_at_spi_context_get_context_path (GTK_AT_SPI_CONTEXT (context));

          g_variant_builder_add (&builder, "(so)", name, path);
-
-          g_object_unref (context);
        }

      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a(so))", &builder));
@@ -457,8 +453,6 @@ gtk_at_spi_root_child_changed (GtkAtSpiRoot             *self,
      GtkATContext *context = gtk_accessible_get_at_context (child);

      window_ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
-
-      g_object_unref (context);
    }

  switch (change)
@@ -94,9 +94,7 @@ listbox_handle_method (GDBusConnection       *connection,
      else
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (counter.child));
-          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+          g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -273,8 +271,7 @@ listview_handle_method (GDBusConnection       *connection,
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+              g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -498,9 +495,7 @@ flowbox_handle_method (GDBusConnection       *connection,
      else
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (counter.child));
-          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+          g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -766,8 +761,7 @@ stackswitcher_handle_method (GDBusConnection       *connection,
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+               g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -897,8 +891,7 @@ notebook_handle_method (GDBusConnection       *connection,
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+               g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -43,7 +43,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_ALERT;

    case GTK_ACCESSIBLE_ROLE_ALERT_DIALOG:
-      return ATSPI_ROLE_ALERT;
+      return ATSPI_ROLE_DIALOG;

    case GTK_ACCESSIBLE_ROLE_BANNER:
      break;
@@ -109,7 +109,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_LABEL;

    case GTK_ACCESSIBLE_ROLE_LANDMARK:
-      return ATSPI_ROLE_LANDMARK;
+      break;

    case GTK_ACCESSIBLE_ROLE_LEGEND:
      return ATSPI_ROLE_LABEL;
@@ -169,7 +169,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_OPTION_PANE;

    case GTK_ACCESSIBLE_ROLE_PRESENTATION:
-      return ATSPI_ROLE_FILLER;
+      return ATSPI_ROLE_SECTION;

    case GTK_ACCESSIBLE_ROLE_PROGRESS_BAR:
      return ATSPI_ROLE_PROGRESS_BAR;
@@ -205,7 +205,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_ENTRY;

    case GTK_ACCESSIBLE_ROLE_SECTION:
-      return ATSPI_ROLE_SECTION;
+      return ATSPI_ROLE_FILLER;

    case GTK_ACCESSIBLE_ROLE_SECTION_HEAD:
      return ATSPI_ROLE_FILLER;
@@ -273,8 +273,6 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
    case GTK_ACCESSIBLE_ROLE_WINDOW:
      return ATSPI_ROLE_FRAME;

-    case GTK_ACCESSIBLE_ROLE_TOGGLE_BUTTON:
-      return ATSPI_ROLE_TOGGLE_BUTTON;
    default:
      break;
    }
@@ -235,7 +235,7 @@
 * button events, however some customized derived areas can be implemented
 * who are interested in handling other events. Handling an event can
 * trigger the [`signal@Gtk.CellArea::focus-changed`] signal to fire; as well
- * as [`signal@Gtk.CellArea::add-editable`] in the case that an editable cell
+ * as [`signal@GtkCellArea::add-editable`] in the case that an editable cell
 * was clicked and needs to start editing. You can call
 * [method@Gtk.CellArea.stop_editing] at any time to cancel any cell editing
 * that is currently in progress.
@@ -995,11 +995,10 @@ gtk_cell_area_box_focus_changed (GtkCellArea        *area,
                                 GParamSpec         *pspec,
                                 GtkCellAreaBox     *box)
 {
-  GtkCellAreaBoxPrivate *priv       = gtk_cell_area_box_get_instance_private (box);
-  GtkCellRenderer       *focus_cell = gtk_cell_area_get_focus_cell (area);
+  GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);

-  if  (focus_cell)
-    priv->last_focus_cell = focus_cell;
+  if (gtk_cell_area_get_focus_cell (area))
+    priv->last_focus_cell = gtk_cell_area_get_focus_cell (area);
 }

 /*************************************************************
@@ -366,6 +366,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
 {
  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
  GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
+  int menu_width;

  gtk_widget_size_allocate (priv->box,
                            &(GtkAllocation) {
@@ -373,8 +374,17 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
                              width, height
                            }, baseline);

-  gtk_widget_set_size_request (priv->popup_widget, width, -1);
-  gtk_widget_queue_resize (priv->popup_widget);
+  gtk_widget_set_size_request (priv->popup_widget, -1, -1);
+
+  if (priv->popup_fixed_width)
+    gtk_widget_measure (priv->popup_widget, GTK_ORIENTATION_HORIZONTAL, -1,
+                        &menu_width, NULL, NULL, NULL);
+  else
+    gtk_widget_measure (priv->popup_widget, GTK_ORIENTATION_HORIZONTAL, -1,
+                        NULL, &menu_width, NULL, NULL);
+
+  gtk_widget_set_size_request (priv->popup_widget,
+                               MAX (width, menu_width), -1);

  gtk_popover_present (GTK_POPOVER (priv->popup_widget));
 }
@@ -37,7 +37,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 * [class@Gtk.FontChooserWidget], [class@Gtk.FontChooserDialog] and
 * [class@Gtk.FontButton].
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */

@@ -60,7 +60,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   *
   * The font description as a string, e.g. "Sans Italic 12".
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  g_object_interface_install_property
     (iface,
@@ -73,7 +73,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   *
   * The font description as a `PangoFontDescription`.
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  g_object_interface_install_property
     (iface,
@@ -86,7 +86,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   *
   * The string with which to preview the font.
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  g_object_interface_install_property
     (iface,
@@ -99,7 +99,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   *
   * Whether to show an entry to change the preview text.
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  g_object_interface_install_property
     (iface,
@@ -112,7 +112,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   *
   * The level of granularity to offer for selecting fonts.
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  g_object_interface_install_property
     (iface,
@@ -131,7 +131,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   * The format of the string is compatible with
   * CSS and with Pango attributes.
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  g_object_interface_install_property
     (iface,
@@ -144,7 +144,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   *
   * The language for which the font features were selected.
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  g_object_interface_install_property
     (iface,
@@ -163,7 +163,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   * or an item is selected and the user presses one of the keys
   * Space, Shift+Space, Return or Enter.
   *
-   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton] instead
+   * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] instead
   */
  chooser_signals[SIGNAL_FONT_ACTIVATED] =
    g_signal_new (I_("font-activated"),
@@ -189,7 +189,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
 * Returns: (nullable) (transfer none): A `PangoFontFamily` representing the
 *   selected font family
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 PangoFontFamily *
@@ -212,7 +212,7 @@ gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser)
 * Returns: (nullable) (transfer none): A `PangoFontFace` representing the
 *   selected font group details
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 PangoFontFace *
@@ -232,7 +232,7 @@ gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser)
 * Returns: A n integer representing the selected font size,
 *   or -1 if no font size is selected.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 int
@@ -261,7 +261,7 @@ gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser)
 * Returns: (nullable) (transfer full): A string with the name
 *   of the current font
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 char *
@@ -284,7 +284,7 @@ gtk_font_chooser_get_font (GtkFontChooser *fontchooser)
 *
 * Sets the currently-selected font.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -315,7 +315,7 @@ gtk_font_chooser_set_font (GtkFontChooser *fontchooser,
 * Returns: (nullable) (transfer full): A `PangoFontDescription` for the
 *   current font
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 PangoFontDescription *
@@ -337,7 +337,7 @@ gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser)
 *
 * Sets the currently-selected font from @font_desc.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -358,7 +358,7 @@ gtk_font_chooser_set_font_desc (GtkFontChooser             *fontchooser,
 *
 * Returns: (transfer full): the text displayed in the preview area
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 char *
@@ -382,7 +382,7 @@ gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser)
 *
 * The @text is used to show how the selected font looks.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -403,7 +403,7 @@ gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser,
 *
 * Returns: %TRUE if the preview entry is shown or %FALSE if it is hidden.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 gboolean
@@ -425,7 +425,7 @@ gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser)
 *
 * Shows or hides the editable preview entry.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -448,7 +448,7 @@ gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
 * Adds a filter function that decides which fonts to display
 * in the font chooser.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -505,7 +505,7 @@ _gtk_font_chooser_font_activated (GtkFontChooser *chooser,
 * pango_context_set_font_map (context, fontmap);
 * ```
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -528,7 +528,7 @@ gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser,
 *
 * Returns: (nullable) (transfer full): a `PangoFontMap`
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 PangoFontMap *
@@ -551,7 +551,7 @@ gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser)
 *
 * Sets the desired level of granularity for selecting fonts.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -571,7 +571,7 @@ gtk_font_chooser_set_level (GtkFontChooser      *fontchooser,
 *
 * Returns: the current granularity level
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 GtkFontChooserLevel
@@ -598,7 +598,7 @@ gtk_font_chooser_get_level (GtkFontChooser *fontchooser)
 *
 * Returns: the currently selected font features
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 char *
@@ -621,7 +621,7 @@ gtk_font_chooser_get_font_features (GtkFontChooser *fontchooser)
 *
 * Returns: the currently selected language
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 char *
@@ -643,7 +643,7 @@ gtk_font_chooser_get_language (GtkFontChooser *fontchooser)
 *
 * Sets the language to use for font features.
 *
- * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@Gtk.FontDialogButton]
+ * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton]
 * instead
 */
 void
@@ -126,7 +126,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 * style class applied.
 *
 * Deprecated: 4.10: There is no replacement in GTK for an "info bar" widget;
- *   you can use [class@Gtk.Revealer] with a [class@Gtk.Box] containing a
+ *   you can use [class@Gtk.Revealer] with a [class@GtkBox] containing a
 *   [class@Gtk.Label] and an optional [class@Gtk.Button], according to
 *   your application's design.
 */
@@ -284,8 +284,7 @@ extract_plane (GdkPixbuf *src,
               int        to_plane)
 {
  guchar *src_data, *dst_data;
-  int width, height;
-  gsize src_stride, dst_stride;
+  int width, height, src_stride, dst_stride;
  guchar *src_row, *dst_row;
  int x, y;

@@ -71,7 +71,7 @@ for f in funcs:
    file_output += ['#ifdef GDK_WINDOWING_WIN32']
    file_output += ['*tp++ = {0}();'.format(f)]
    file_output += ['#endif']
-  elif f.startswith('gdk_macos'):
+  elif f.startswith('gdk_quartz'):
    file_output += ['#ifdef GDK_WINDOWING_MACOS']
    file_output += ['*tp++ = {0}();'.format(f)]
    file_output += ['#endif']
@@ -460,9 +460,6 @@ gsk_pango_renderer_release (GskPangoRenderer *renderer)
 * Creates render nodes for rendering @layout in the given foregound @color
 * and appends them to the current node of @snapshot without changing the
 * current node.
- *
- * Note that if the layout does not produce any visible output, then nodes
- * may not be added to the @snapshot.
 **/
 void
 gtk_snapshot_append_layout (GtkSnapshot   *snapshot,
@@ -91,9 +91,9 @@ gtk_accessible_default_init (GtkAccessibleInterface *iface)
 * gtk_accessible_get_at_context:
 * @self: a `GtkAccessible`
 *
- * Retrieves the accessible implementation for the given `GtkAccessible`.
+ * Retrieves the `GtkATContext` for the given `GtkAccessible`.
 *
- * Returns: (transfer full): the accessible implementation object
+ * Returns: (transfer none): the `GtkATContext`
 *
 * Since: 4.10
 */
@@ -109,11 +109,11 @@ gtk_accessible_get_at_context (GtkAccessible *self)
 * gtk_accessible_get_accessible_parent:
 * @self: a `GtkAccessible`
 *
- * Retrieves the accessible parent for an accessible object.
+ * Retrieves the accessible accessible for an accessible object
 *
- * This function returns `NULL` for top level widgets.
+ * This function returns `NULL` for top level widgets
 *
- * Returns: (transfer full) (nullable): the accessible parent
+ * Returns: (transfer none) (nullable): the accessible parent
 *
 * Since: 4.10
 */
@@ -127,13 +127,10 @@ gtk_accessible_get_accessible_parent (GtkAccessible *self)

  context = gtk_accessible_get_at_context (self);
  if (context != NULL)
-    {
-      parent = gtk_at_context_get_accessible_parent (context);
-      g_object_unref (context);
-    }
-
+    parent = gtk_at_context_get_accessible_parent (context);
+ 
  if (parent != NULL)
-    return g_object_ref (parent);
+    return parent;
  else
    return GTK_ACCESSIBLE_GET_IFACE (self)->get_accessible_parent (self);
 }
@@ -164,7 +161,6 @@ gtk_accessible_set_accessible_parent (GtkAccessible *self,
  g_return_if_fail (GTK_IS_ACCESSIBLE (self));
  g_return_if_fail (parent == NULL || GTK_IS_ACCESSIBLE (parent));
  g_return_if_fail (next_sibling == NULL || GTK_IS_ACCESSIBLE (parent));
-
  GtkATContext *context;

  context = gtk_accessible_get_at_context (self);
@@ -172,7 +168,6 @@ gtk_accessible_set_accessible_parent (GtkAccessible *self,
    {
      gtk_at_context_set_accessible_parent (context, parent);
      gtk_at_context_set_next_accessible_sibling (context, next_sibling);
-      g_object_unref (context);
    }
 }

@@ -182,7 +177,6 @@ gtk_accessible_set_accessible_parent (GtkAccessible *self,
 * @new_sibling: (nullable): the new next accessible sibling to set
 *
 * Updates the next accessible sibling of @self.
- *
 * That might be useful when a new child of a custom `GtkAccessible`
 * is created, and it needs to be linked to a previous child.
 *
@@ -193,26 +187,20 @@ gtk_accessible_update_next_accessible_sibling (GtkAccessible *self,
                                               GtkAccessible *new_sibling)
 {
  GtkATContext *context;
-  GtkAccessible *parent;

  g_return_if_fail (GTK_IS_ACCESSIBLE (self));

  context = gtk_accessible_get_at_context (self);
-  if (context == NULL)
+  if (!context)
    return;
-
-  parent = gtk_at_context_get_accessible_parent (context);
-  if (parent == NULL)
-    {
-      g_object_unref (context);
-      g_critical ("Failed to update next accessible sibling: no parent accessible set for this accessible");
-      return;
-    }
+  
+  if (gtk_at_context_get_accessible_parent (context) == NULL)
+  {
+    g_critical ("Failed to update next accessible sibling: no parent accessible set for this accessible");
+    return;
+  }

  gtk_at_context_set_next_accessible_sibling (context, new_sibling);
-
-  g_object_unref (parent);
-  g_object_unref (context);
 }

 /**
@@ -221,7 +209,7 @@ gtk_accessible_update_next_accessible_sibling (GtkAccessible *self,
 *
 * Retrieves the first accessible child of an accessible object.
 *
- * Returns: (transfer full) (nullable): the first accessible child
+ * Returns: (transfer none) (nullable): the first accessible child
 *
 * since: 4.10
 */
@@ -239,7 +227,7 @@ gtk_accessible_get_first_accessible_child (GtkAccessible *self)
 *
 * Retrieves the next accessible sibling of an accessible object
 *
- * Returns: (transfer full) (nullable): the next accessible sibling
+ * Returns: (transfer none) (nullable): the next accessible sibling
 *
 * since: 4.10
 */
@@ -249,21 +237,12 @@ gtk_accessible_get_next_accessible_sibling (GtkAccessible *self)
  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), NULL);

  GtkATContext *context;
-  GtkAccessible *sibling = NULL;

  context = gtk_accessible_get_at_context (self);
  if (context != NULL && gtk_at_context_get_accessible_parent (context) != NULL)
-    {
-      sibling = gtk_at_context_get_next_accessible_sibling (context);
-      if (sibling != NULL)
-        sibling = g_object_ref (sibling);
-    }
+    return gtk_at_context_get_next_accessible_sibling (context);
  else
-    sibling = GTK_ACCESSIBLE_GET_IFACE (self)->get_next_accessible_sibling (self);
-
-  g_clear_object (&context);
-
-  return sibling;
+    return GTK_ACCESSIBLE_GET_IFACE (self)->get_next_accessible_sibling (self);
 }

 /**
@@ -277,21 +256,13 @@ gtk_accessible_get_next_accessible_sibling (GtkAccessible *self)
 GtkAccessibleRole
 gtk_accessible_get_accessible_role (GtkAccessible *self)
 {
-  GtkAccessibleRole role = GTK_ACCESSIBLE_ROLE_NONE;
+  GtkAccessibleRole role;

  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), GTK_ACCESSIBLE_ROLE_NONE);

  GtkATContext *context = gtk_accessible_get_at_context (self);
-  if (context != NULL)
-    {
-      if (gtk_at_context_is_realized (context))
-        role = gtk_at_context_get_accessible_role (context);
-
-      g_object_unref (context);
-
-      if (role != GTK_ACCESSIBLE_ROLE_NONE)
-        return role;
-    }
+  if (context != NULL && gtk_at_context_is_realized (context))
+    return gtk_at_context_get_accessible_role (context);

  g_object_get (G_OBJECT (self), "accessible-role", &role, NULL);

@@ -365,8 +336,6 @@ gtk_accessible_update_state (GtkAccessible      *self,

 out:
  va_end (args);
-
-  g_object_unref (context);
 }

 /**
@@ -420,7 +389,6 @@ gtk_accessible_update_state_value (GtkAccessible      *self,
    }

  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -444,7 +412,6 @@ gtk_accessible_reset_state (GtkAccessible      *self,

  gtk_at_context_set_accessible_state (context, state, NULL);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -516,8 +483,6 @@ gtk_accessible_update_property (GtkAccessible         *self,

 out:
  va_end (args);
-
-  g_object_unref (context);
 }

 /**
@@ -571,7 +536,6 @@ gtk_accessible_update_property_value (GtkAccessible         *self,
    }

  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -595,7 +559,6 @@ gtk_accessible_reset_property (GtkAccessible         *self,

  gtk_at_context_set_accessible_property (context, property, NULL);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -667,8 +630,6 @@ gtk_accessible_update_relation (GtkAccessible         *self,

 out:
  va_end (args);
-
-  g_object_unref (context);
 }

 /**
@@ -697,8 +658,6 @@ gtk_accessible_update_relation_value (GtkAccessible         *self,
  g_return_if_fail (n_relations > 0);

  context = gtk_accessible_get_at_context (self);
-  if (context == NULL)
-    return;

  for (int i = 0; i < n_relations; i++)
    {
@@ -717,14 +676,15 @@ gtk_accessible_update_relation_value (GtkAccessible         *self,
          break;
        }

-      gtk_at_context_set_accessible_relation (context, relation, real_value);
+      if (context)
+        gtk_at_context_set_accessible_relation (context, relation, real_value);

      if (real_value != NULL)
        gtk_accessible_value_unref (real_value);
    }

-  gtk_at_context_update (context);
-  g_object_unref (context);
+  if (context)
+    gtk_at_context_update (context);
 }

 /**
@@ -748,7 +708,6 @@ gtk_accessible_reset_relation (GtkAccessible         *self,

  gtk_at_context_set_accessible_relation (context, relation, NULL);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 static const char *role_names[] = {
@@ -830,7 +789,6 @@ static const char *role_names[] = {
  [GTK_ACCESSIBLE_ROLE_TREE_ITEM] = NC_("accessibility", "tree item"),
  [GTK_ACCESSIBLE_ROLE_WIDGET] = NC_("accessibility", "widget"),
  [GTK_ACCESSIBLE_ROLE_WINDOW] = NC_("accessibility", "window"),
-  [GTK_ACCESSIBLE_ROLE_TOGGLE_BUTTON] = NC_("accessibility", "toggle button"),
 };

 /*< private >
@@ -910,22 +868,13 @@ gtk_accessible_platform_changed (GtkAccessible               *self,

  /* propagate changes up from ignored widgets */
  if (gtk_accessible_get_accessible_role (self) == GTK_ACCESSIBLE_ROLE_NONE)
-    {
-      GtkAccessible *parent = gtk_accessible_get_accessible_parent (self);
-
-      if (parent != NULL)
-        {
-          context = gtk_accessible_get_at_context (parent);
-          g_object_unref (parent);
-        }
-    }
+    context = gtk_accessible_get_at_context (gtk_accessible_get_accessible_parent (self));

  if (context == NULL)
    return;

  gtk_at_context_platform_changed (context, change);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -979,7 +928,6 @@ gtk_accessible_bounds_changed (GtkAccessible *self)
    return;

  gtk_at_context_bounds_changed (context);
-  g_object_unref (context);
 }

 /**
@@ -1032,7 +980,6 @@ gtk_accessible_should_present (GtkAccessible *self)
 {
  GtkAccessibleRole role;
  GtkATContext *context;
-  gboolean res = TRUE;

  if (GTK_IS_WIDGET (self) &&
      !gtk_widget_get_visible (GTK_WIDGET (self)))
@@ -1053,12 +1000,10 @@ gtk_accessible_should_present (GtkAccessible *self)

      value = gtk_at_context_get_accessible_state (context, GTK_ACCESSIBLE_STATE_HIDDEN);
      if (gtk_boolean_accessible_value_get (value))
-        res = FALSE;
+        return FALSE;
    }

-  g_object_unref (context);
-
-  return res;
+  return TRUE;
 }

 void
@@ -1072,24 +1017,15 @@ gtk_accessible_update_children (GtkAccessible           *self,
      gtk_widget_get_root (GTK_WIDGET (self)) == NULL)
    return;

+  context = gtk_accessible_get_at_context (self);
+
  /* propagate changes up from ignored widgets */
  if (gtk_accessible_get_accessible_role (self) == GTK_ACCESSIBLE_ROLE_NONE)
-    {
-      GtkAccessible *parent = gtk_accessible_get_accessible_parent (self);
-
-      context = gtk_accessible_get_at_context (parent);
-
-      g_object_unref (parent);
-    }
-  else
-    {
-      context = gtk_accessible_get_at_context (self);
-    }
+    context = gtk_accessible_get_at_context (gtk_accessible_get_accessible_parent (self));

  if (context == NULL)
    return;

  gtk_at_context_child_changed (context, 1 << state, child);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }
@@ -73,7 +73,7 @@ struct _GtkAccessibleInterface
   * Retrieves the platform-specific accessibility context for the
   * accessible implementation.
   *
-   * Returns: (transfer full) (nullable): the accessibility context
+   * Returns: (transfer none) (nullable): the accessibility context
   *
   * Since: 4.10
   */
@@ -101,7 +101,7 @@ struct _GtkAccessibleInterface
   *
   * This virtual function should return `NULL` for top level objects.
   *
-   * Returns: (nullable) (transfer full): the accessible parent
+   * Returns: (nullable) (transfer none): the accessible parent
   *
   * Since: 4.10
   */
@@ -113,7 +113,7 @@ struct _GtkAccessibleInterface
   *
   * Retrieves the first accessible child of an accessible object.
   *
-   * Returns: (transfer full) (nullable): an accessible object
+   * Returns: (transfer none) (nullable): an accessible object
   *
   * Since: 4.10
   */
@@ -125,7 +125,7 @@ struct _GtkAccessibleInterface
   *
   * Retrieves the next accessible sibling of an accessible object.
   *
-   * Returns: (transfer full) (nullable): an accessible object
+   * Returns: (transfer none) (nullable): an accessible object
   *
   * Since: 4.10
   */
@@ -232,8 +232,6 @@ gtk_action_muxer_list_actions (GtkActionMuxer *muxer,
  GHashTable *actions;
  char **keys;

-  g_return_val_if_fail (GTK_IS_ACTION_MUXER (muxer), NULL);
-
  actions = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);

  for ( ; muxer != NULL; muxer = muxer->parent)
@@ -74,7 +74,7 @@ gboolean                gtk_action_muxer_query_action                   (GtkActi
                                                                         const GVariantType **parameter_type,
                                                                         const GVariantType **state_type,
                                                                         GVariant           **state_hint,
-                                                                         GVariant           **state) G_GNUC_WARN_UNUSED_RESULT;
+                                                                         GVariant           **state);
 void                    gtk_action_muxer_activate_action                (GtkActionMuxer      *muxer,
                                                                         const char          *action_name,
                                                                         GVariant            *parameter);
@@ -352,21 +352,6 @@ gtk_adjustment_dispatch_properties_changed (GObject     *object,
    }
 }

-static double
-gtk_adjustment_sanitize_value (GtkAdjustment *self,
-                               double         value)
-{
-  GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (self);
-
-  /* don't use CLAMP() so we don't end up below lower if upper - page_size
-   * is smaller than lower
-   */
-  value = MIN (value, priv->upper - priv->page_size);
-  value = MAX (value, priv->lower);
-
-  return value;
-}
-
 /**
 * gtk_adjustment_new:
 * @value: the initial value
@@ -434,8 +419,6 @@ adjustment_set_value (GtkAdjustment *adjustment,
 {
  GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment);

-  value = gtk_adjustment_sanitize_value (adjustment, value);
-
  if (priv->value != value)
    {
      priv->value = value;
@@ -514,7 +497,11 @@ gtk_adjustment_set_value_internal (GtkAdjustment *adjustment,
 {
  GtkAdjustmentPrivate *priv = gtk_adjustment_get_instance_private (adjustment);

-  value = gtk_adjustment_sanitize_value (adjustment, value);
+  /* don't use CLAMP() so we don't end up below lower if upper - page_size
+   * is smaller than lower
+   */
+  value = MIN (value, priv->upper - priv->page_size);
+  value = MAX (value, priv->lower);

  if (animate && priv->duration != 0 && priv->clock != NULL)
    {
@@ -838,7 +825,11 @@ gtk_adjustment_configure (GtkAdjustment *adjustment,
  gtk_adjustment_set_page_increment (adjustment, page_increment);
  gtk_adjustment_set_page_size (adjustment, page_size);

-  value = gtk_adjustment_sanitize_value (adjustment, value);
+  /* don't use CLAMP() so we don't end up below lower if upper - page_size
+   * is smaller than lower
+   */
+  value = MIN (value, upper - page_size);
+  value = MAX (value, lower);

  if (value != priv->value)
    {
@@ -747,9 +747,6 @@ gtk_alert_dialog_choose_finish (GtkAlertDialog  *self,
  g_return_val_if_fail (g_task_is_valid (result, self), -1);
  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == gtk_alert_dialog_choose, -1);

-  /* Destroy the dialog window not to be bound to GTask lifecycle */
-  g_task_set_task_data (G_TASK (result), NULL, NULL);
-
  return (int) g_task_propagate_int (G_TASK (result), error);
 }

@@ -85,20 +85,6 @@ gtk_at_context_dispose (GObject *gobject)

  gtk_at_context_unrealize (self);

-  if (self->accessible_parent != NULL)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (self->accessible_parent),
-                                    (gpointer *) &self->accessible_parent);
-      self->accessible_parent = NULL;
-    }
-
-  if (self->next_accessible_sibling != NULL)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (self->next_accessible_sibling),
-                                    (gpointer *) &self->next_accessible_sibling);
-      self->next_accessible_sibling = NULL;
-    }
-
  G_OBJECT_CLASS (gtk_at_context_parent_class)->dispose (gobject);
 }

@@ -473,14 +459,14 @@ GtkAccessible *
 gtk_at_context_get_accessible_parent (GtkATContext *self)
 {
  g_return_val_if_fail (GTK_IS_AT_CONTEXT (self), NULL);
-
+  
  return self->accessible_parent;
 }

 /*< private >
 * gtk_at_context_set_accessible_parent:
 * @self: a `GtkAtContext`
- * @parent: (nullable): the parent `GtkAccessible` to set
+ * @parent: the parent `GtkAccessible` to set
 *
 * Sets the parent accessible object of the given `GtkAtContext`.
 */
@@ -489,18 +475,8 @@ gtk_at_context_set_accessible_parent (GtkATContext *self,
                                      GtkAccessible *parent)
 {
  g_return_if_fail (GTK_IS_AT_CONTEXT (self));
-
-  if (self->accessible_parent != parent)
-    {
-      if (self->accessible_parent != NULL)
-        g_object_remove_weak_pointer (G_OBJECT (self->accessible_parent),
-                                      (gpointer *) &self->accessible_parent);
-
-      self->accessible_parent = parent;
-      if (self->accessible_parent != NULL)
-        g_object_add_weak_pointer (G_OBJECT (self->accessible_parent),
-                                   (gpointer *) &self->accessible_parent);
-    }
+  
+  g_set_object (&self->accessible_parent, parent);
 }

 /*< private >
@@ -515,7 +491,7 @@ GtkAccessible *
 gtk_at_context_get_next_accessible_sibling (GtkATContext *self)
 {
  g_return_val_if_fail (GTK_IS_AT_CONTEXT (self), NULL);
-
+  
  return self->next_accessible_sibling;
 }

@@ -531,19 +507,8 @@ gtk_at_context_set_next_accessible_sibling (GtkATContext *self,
                                            GtkAccessible *sibling)
 {
  g_return_if_fail (GTK_IS_AT_CONTEXT (self));
-
-  if (self->next_accessible_sibling != sibling)
-    {
-      if (self->next_accessible_sibling != NULL)
-        g_object_remove_weak_pointer (G_OBJECT (self->next_accessible_sibling),
-                                      (gpointer *) &self->next_accessible_sibling);
-
-      self->next_accessible_sibling = sibling;
-
-      if (self->next_accessible_sibling != NULL)
-        g_object_add_weak_pointer (G_OBJECT (self->next_accessible_sibling),
-                                   (gpointer *) &self->next_accessible_sibling);
-    }
+  
+  g_set_object (&self->next_accessible_sibling, sibling);
 }

 /*< private >
@@ -1028,8 +993,6 @@ gtk_at_context_get_name_accumulate (GtkATContext *self,
          GtkATContext *rel_context = gtk_accessible_get_at_context (rel);

          gtk_at_context_get_name_accumulate (rel_context, names, FALSE);
-
-          g_object_unref (rel_context);
        }
    }

@@ -1102,8 +1065,6 @@ gtk_at_context_get_description_accumulate (GtkATContext *self,
          GtkATContext *rel_context = gtk_accessible_get_at_context (rel);

          gtk_at_context_get_description_accumulate (rel_context, labels, FALSE);
-
-          g_object_unref (rel_context);
        }
    }

@@ -105,7 +105,7 @@ struct _GtkBuildableParser
 * @set_buildable_property: Sets a property of a buildable object.
 *  It is normally not necessary to implement this, g_object_set_property()
 *  is used by default. `GtkWindow` implements this to delay showing itself
- *  (i.e. setting the [property@Gtk.Widget:visible] property) until the whole
+ *  (i.e. setting the [property@GtkWidget:visible] property) until the whole
 *  interface is created.
 * @construct_child: Constructs a child of a buildable that has been
 *  specified as “constructor” in the UI definition. This can be used to
@@ -1608,7 +1608,6 @@ create_subparser (GObject       *object,
  subparser->object = object;
  subparser->child = child;
  subparser->tagname = g_strdup (element_name);
-  subparser->level = 1;
  subparser->start = element_name;
  subparser->parser = g_memdup2 (parser, sizeof (GtkBuildableParser));
  subparser->data = user_data;
@@ -1639,8 +1638,6 @@ subparser_start (GtkBuildableParseContext  *context,

  if (subparser->start)
    {
-      subparser->level++;
-
      if (subparser->parser->start_element)
        subparser->parser->start_element (context,
                                          element_name, names, values,
@@ -1656,8 +1653,6 @@ subparser_end (GtkBuildableParseContext  *context,
               ParserData                *data,
               GError                   **error)
 {
-  data->subparser->level--;
-
  if (data->subparser->parser->end_element)
    data->subparser->parser->end_element (context, element_name,
                                          data->subparser->data, error);
@@ -1665,11 +1660,9 @@ subparser_end (GtkBuildableParseContext  *context,
  if (*error)
    return;

-  if (data->subparser->level > 0)
+  if (strcmp (data->subparser->start, element_name) != 0)
    return;

-  g_assert (strcmp (data->subparser->start, element_name) == 0);
-
  gtk_buildable_custom_tag_end (GTK_BUILDABLE (data->subparser->object),
                                data->builder,
                                data->subparser->child,
@@ -165,7 +165,6 @@ struct _GtkBuildableParseContext {
 typedef struct {
  GtkBuildableParser *parser;
  char *tagname;
-  int level;
  const char *start;
  gpointer data;
  GObject *object;
@@ -19,7 +19,7 @@
 * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
 * file for a list of people on the GTK+ Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
 */

 /**
@@ -63,6 +63,7 @@

 #include "gtkactionhelperprivate.h"
 #include "gtkbuildable.h"
+#include "gtkcheckbutton.h"
 #include "gtkgestureclick.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtkbinlayout.h"
@@ -288,9 +289,6 @@ gtk_button_class_init (GtkButtonClass *klass)
   *
   * This is an action signal. Applications should never connect
   * to this signal, but use the [signal@Gtk.Button::clicked] signal.
-   *
-   * The default bindings for this signal are all forms of the
-   * <kbd>␣</kbd> and <kbd>Enter</kbd> keys.
   */
  button_signals[ACTIVATE] =
    g_signal_new (I_("activate"),
@@ -672,8 +670,7 @@ gtk_button_new_from_icon_name (const char *icon_name)
 * If characters in @label are preceded by an underscore, they are underlined.
 * If you need a literal underscore character in a label, use “__” (two
 * underscores). The first underlined character represents a keyboard
- * accelerator called a mnemonic. Pressing <kbd>Alt</kbd> and that key
- * activates the button.
+ * accelerator called a mnemonic. Pressing Alt and that key activates the button.
 *
 * Returns: a new `GtkButton`
 */
@@ -832,6 +829,8 @@ gtk_button_set_label (GtkButton   *button,
          gtk_label_set_use_underline (GTK_LABEL (child), priv->use_underline);
          gtk_label_set_mnemonic_widget (GTK_LABEL (child), GTK_WIDGET (button));
        }
+      if (GTK_IS_CHECK_BUTTON (button))
+        gtk_label_set_xalign (GTK_LABEL (child), 0.0);

      gtk_button_set_child (button,  child);
    }
@@ -481,15 +481,16 @@ gtk_check_button_focus (GtkWidget         *widget,
            }
        }

-      g_ptr_array_free (child_array, TRUE);

-      if (new_focus && new_focus != widget)
+      if (new_focus)
        {
          gtk_widget_grab_focus (new_focus);
          gtk_widget_activate (new_focus);
-          return TRUE;
        }
-      return FALSE;
+
+      g_ptr_array_free (child_array, TRUE);
+
+      return TRUE;
    }
  else
    {
@@ -672,9 +673,6 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
   * Applications should never connect to this signal, but use the
   * [signal@Gtk.CheckButton::toggled] signal.
   *
-   * The default bindings for this signal are all forms of the
-   * <kbd>␣</kbd> and <kbd>Enter</kbd> keys.
-   *
   * Since: 4.2
   */
  signals[ACTIVATE] =
@@ -492,9 +492,6 @@ gtk_color_dialog_choose_rgba_finish (GtkColorDialog  *self,
  g_return_val_if_fail (g_task_is_valid (result, self), NULL);
  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == gtk_color_dialog_choose_rgba, NULL);

-  /* Destroy the dialog window not to be bound to GTask lifecycle */
-  g_task_set_task_data (G_TASK (result), NULL, NULL);
-
  return g_task_propagate_pointer (G_TASK (result), error);
 }

@@ -103,8 +103,6 @@ gtk_column_list_item_factory_update (GtkListItemFactory *factory,
 {
  GtkListItem *list_item = GTK_LIST_ITEM (item);
  GtkWidget *child;
-  gboolean selectable = TRUE;
-  gboolean activatable = TRUE;

  GTK_LIST_ITEM_FACTORY_CLASS (gtk_column_list_item_factory_parent_class)->update (factory, item, unbind, bind, func, data);

@@ -112,28 +110,11 @@ gtk_column_list_item_factory_update (GtkListItemFactory *factory,
       child;
       child = gtk_widget_get_next_sibling (child))
    {
-      GtkListItem *cell_item;
-
      gtk_list_item_widget_update (GTK_LIST_ITEM_WIDGET (child),
                                   gtk_list_item_get_position (list_item),
                                   gtk_list_item_get_item (list_item),
                                   gtk_list_item_get_selected (list_item));
-
-       cell_item = gtk_list_item_widget_get_list_item (GTK_LIST_ITEM_WIDGET (child));
-       if (cell_item)
-         {
-           selectable &= gtk_list_item_get_selectable (cell_item);
-           activatable &= gtk_list_item_get_activatable (cell_item);
-        }
    }
-
-  /* This really does not belong here, but doing better
-   * requires considerable plumbing that we don't have now,
-   * and something like this is needed to fix the filechooser
-   * in select_folder mode.
-   */
-  gtk_list_item_set_selectable (list_item, selectable);
-  gtk_list_item_set_activatable (list_item, activatable);
 }

 static void
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	49e93f6ee4	textview: Don't validate during snapshot Do it during size_allocate, and go back there if needed.	2023-02-21 15:04:30 -05:00
Matthias Clasen	4ec2234537	widget: Warn for invalidation during paint	2023-02-21 15:04:30 -05:00
Matthias Clasen	5a3755b233	frameclock: Add a debug helper Begin able to query the current phase is useful for debugging purposes.	2023-02-21 15:04:30 -05:00