spin button: Listen for ::cancel on gestures

Otherwise, we keep spinning when we should stop. Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1861
widget: Update controllers responsiveness
2019-05-02 19:15:37 +00:00 · 2019-05-02 19:15:37 +00:00 · 2019-05-02 19:15:37 +00:00 · 2019-05-02 19:15:37 +00:00 · 2019-05-02 19:35:45 +02:00 · 2019-05-02 19:35:45 +02:00
115 changed files with 2899 additions and 2333 deletions
@@ -31,6 +31,7 @@ do_expander (GtkWidget *do_widget)
  GtkWidget *toplevel;
  GtkWidget *area;
  GtkWidget *expander;
+  GtkWidget *label;
  GtkWidget *sw;
  GtkWidget *tv;
  GtkTextBuffer *buffer;
@@ -50,13 +51,19 @@ do_expander (GtkWidget *do_widget)

      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));

+      label = gtk_widget_get_last_child (area);
+      gtk_label_set_line_wrap (GTK_LABEL (label), FALSE);
+      gtk_widget_set_vexpand (label, FALSE);
+
      expander = gtk_expander_new ("Details:");
+      gtk_widget_set_vexpand (expander, TRUE);
      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
+      gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (sw), TRUE);

      tv = gtk_text_view_new ();
      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
@@ -101,51 +101,41 @@ do_menus (GtkWidget *do_widget)

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_container_add (GTK_CONTAINER (window), box);
-      gtk_widget_show (box);

      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_add (GTK_CONTAINER (box), box1);
-      gtk_widget_show (box1);

      menubar = gtk_menu_bar_new ();
      gtk_widget_set_hexpand (menubar, TRUE);
      gtk_container_add (GTK_CONTAINER (box1), menubar);
-      gtk_widget_show (menubar);

      menu = create_menu (2);

      menuitem = gtk_menu_item_new_with_label ("test\nline2");
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);

      menuitem = gtk_menu_item_new_with_label ("foo");
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3));
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);

      menuitem = gtk_menu_item_new_with_label ("bar");
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4));
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
-      gtk_widget_show (menuitem);

      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
      gtk_container_add (GTK_CONTAINER (box1), box2);
-      gtk_widget_show (box2);

      button = gtk_button_new_with_label ("Flip");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (change_orientation), menubar);
      gtk_container_add (GTK_CONTAINER (box2), button);
-      gtk_widget_show (button);

      button = gtk_button_new_with_label ("Close");
      g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK(gtk_widget_destroy), window);
      gtk_container_add (GTK_CONTAINER (box2), button);
-      gtk_widget_set_can_default (button, TRUE);
-      gtk_widget_grab_default (button);
-      gtk_widget_show (button);
+      gtk_window_set_default_widget (GTK_WINDOW (window), button);
    }

  if (!gtk_widget_get_visible (window))
@@ -76,8 +76,7 @@ do_password_entry (GtkWidget *do_widget)
      gtk_widget_set_sensitive (button, FALSE);
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

-      gtk_widget_set_can_default (button, TRUE);
-      gtk_window_set_default (GTK_WINDOW (window), button);
+      gtk_window_set_default_widget (GTK_WINDOW (window), button);
    }

  if (!gtk_widget_get_visible (window))
@@ -99,8 +99,7 @@ do_tagged_entry (GtkWidget *do_widget)
      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

-      gtk_widget_set_can_default (button, TRUE);
-      gtk_window_set_default (GTK_WINDOW (window), button);
+      gtk_window_set_default_widget (GTK_WINDOW (window), button);
    }

  if (!gtk_widget_get_visible (window))
@@ -2880,6 +2880,17 @@ microphone-sensitivity-medium-symbolic</property>
                                    <child>
                                      <object class="GtkNotebook">
                                        <property name="show-border">0</property>
+                                        <child type="action-end">
+                                          <object class="GtkMenuButton">
+                                            <property name="valign">center</property>
+                                            <property name="popover">notebook_info_popover2</property>
+                                            <property name="icon-name">emblem-important-symbolic</property>
+                                            <property name="relief">none</property>
+                                            <style>
+                                              <class name="circular"/>
+                                            </style>
+                                          </object>
+                                        </child>
                                        <child>
                                          <object class="GtkNotebookPage">
                                            <property name="tab-expand">1</property>
@@ -3143,6 +3154,7 @@ bad things might happen.</property>
    <property name="use-header-bar">1</property>
    <property name="title" translatable="yes">Zelda</property>
    <property name="hide-on-close">1</property>
+    <property name="default-widget">act_action_dialog</property>
    <child internal-child="content_area">
      <object class="GtkBox">
        <child>
@@ -3164,8 +3176,6 @@ bad things might happen.</property>
    </child>
    <child type="action">
      <object class="GtkButton" id="act_action_dialog">
-        <property name="can-default">1</property>
-        <property name="has-default">1</property>
        <property name="label" translatable="yes">_Act</property>
        <property name="use-underline">1</property>
      </object>
@@ -3303,6 +3313,7 @@ bad things might happen.</property>
    <property name="use-header-bar">1</property>
    <property name="title" translatable="yes">Choose one</property>
    <property name="hide-on-close">1</property>
+    <property name="default-widget">select_selection_dialog</property>
    <child internal-child="content_area">
      <object class="GtkBox">
        <child>
@@ -3324,8 +3335,6 @@ bad things might happen.</property>
    </child>
    <child type="action">
      <object class="GtkButton" id="select_selection_dialog">
-        <property name="can-default">1</property>
-        <property name="has-default">1</property>
        <property name="label" translatable="yes">_Select</property>
        <property name="use-underline">1</property>
      </object>
@@ -3386,6 +3395,7 @@ bad things might happen.</property>
            <layout>
              <property name="left-attach">1</property>
              <property name="top-attach">1</property>
+              <property name="column-span">2</property>
            </layout>
          </object>
        </child>
@@ -3398,22 +3408,52 @@ bad things might happen.</property>
            <layout>
              <property name="left-attach">1</property>
              <property name="top-attach">0</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkExpander">
+            <child type="label">
+              <object class="GtkLabel">
+                <property name="label">Extra Info</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkEntry">
+                <property name="placeholder-text">Tell me anything…</property>
+              </object>
+            </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkMenuButton">
+            <property name="halign">end</property>
+            <property name="icon-name">emblem-system-symbolic</property>
+            <property name="menu-model">gear_menu</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
        <child>
          <object class="GtkButton" id="open_popover_button">
-            <property name="halign">end</property>
+            <property name="halign">fill</property>
            <property name="label">_Open</property>
            <property name="use-underline">1</property>
            <property name="sensitive">0</property>
-            <property name="can-default">1</property>
            <style>
              <class name="suggested-action"/>
            </style>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
@@ -3439,8 +3479,9 @@ bad things might happen.</property>
    </widgets>
  </object>
  <object class="GtkPopover" id="notebook_info_popover">
+    <property name="modal">0</property>
    <child>
-      <object class="GtkLabel" id="notebook_info_label">
+      <object class="GtkLabel">
        <property name="label">No updates at this time</property>
        <accessibility>
          <role type="static"/>
@@ -3448,4 +3489,39 @@ bad things might happen.</property>
      </object>
    </child>
  </object>
+  <object class="GtkPopover" id="notebook_info_popover3">
+    <property name="modal">0</property>
+    <child>
+      <object class="GtkLabel">
+        <property name="label">You're in too deep!</property>
+        <accessibility>
+          <role type="static"/>
+        </accessibility>
+      </object>
+    </child>
+  </object>
+  <object class="GtkPopover" id="notebook_info_popover2">
+    <property name="modal">0</property>
+    <child>
+      <object class="GtkBox">
+        <property name="orientation">horizontal</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Hidden gems:</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkMenuButton">
+            <property name="valign">center</property>
+            <property name="popover">notebook_info_popover3</property>
+            <property name="icon-name">emblem-important-symbolic</property>
+            <property name="relief">none</property>
+            <style>
+              <class name="circular"/>
+            </style>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>
@@ -231,6 +231,7 @@ gdk_surface_get_scale_factor
 gdk_surface_set_opaque_region
 gdk_surface_create_gl_context
 gdk_surface_create_vulkan_context
+gdk_surface_create_cairo_context

 <SUBSECTION>
 gdk_surface_queue_expose
@@ -988,7 +989,6 @@ gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
 gdk_wayland_display_query_registry
-gdk_wayland_surface_new_subsurface
 gdk_wayland_surface_get_wl_surface
 GdkWaylandSurfaceExported
 gdk_wayland_surface_export_handle
@@ -62,6 +62,7 @@ gsk_outset_shadow_node_get_spread
 gsk_outset_shadow_node_get_blur_radius
 gsk_cairo_node_new
 gsk_cairo_node_get_draw_context
+gsk_cairo_node_peek_surface
 gsk_container_node_new
 gsk_container_node_get_n_children
 gsk_container_node_get_child
@@ -88,6 +89,7 @@ GskShadow
 gsk_shadow_node_new
 gsk_shadow_node_peek_shadow
 gsk_shadow_node_get_n_shadows
+gsk_shadow_node_get_child
 GskBlendMode
 gsk_blend_node_new
 gsk_blend_node_get_bottom_child
@@ -103,6 +105,7 @@ gsk_text_node_peek_glyphs
 gsk_text_node_peek_color
 gsk_text_node_get_x
 gsk_text_node_get_y
+gsk_text_node_get_num_glyphs
 gsk_blur_node_new
 gsk_blur_node_get_child
 gsk_blur_node_get_radius
@@ -162,6 +165,7 @@ gsk_transform_to_translate
 gsk_transform_transform
 gsk_transform_invert
 gsk_transform_matrix
+gsk_transform_matrix_with_category
 gsk_transform_translate
 gsk_transform_translate_3d
 gsk_transform_rotate
@@ -1779,7 +1779,6 @@ GtkMenu
 GtkArrowPlacement
 gtk_menu_new
 gtk_menu_new_from_model
-gtk_menu_set_display
 gtk_menu_reorder_child
 gtk_menu_popup_at_rect
 gtk_menu_popup_at_widget
@@ -4433,7 +4432,6 @@ gtk_widget_event
 gtk_widget_activate
 gtk_widget_is_focus
 gtk_widget_grab_focus
-gtk_widget_grab_default
 gtk_widget_set_name
 gtk_widget_get_name
 gtk_widget_set_sensitive
@@ -4504,8 +4502,6 @@ gtk_widget_compute_point
 gtk_widget_contains
 GtkPickFlags
 gtk_widget_pick
-gtk_widget_get_can_default
-gtk_widget_set_can_default
 gtk_widget_get_can_focus
 gtk_widget_set_can_focus
 gtk_widget_get_focus_on_click
@@ -4538,13 +4534,15 @@ gtk_widget_get_realized
 gtk_widget_get_mapped
 gtk_widget_device_is_shadowed
 gtk_widget_get_modifier_mask
-gtk_widget_insert_action_group
 gtk_widget_get_opacity
 gtk_widget_set_opacity
 gtk_widget_get_overflow
 gtk_widget_set_overflow
+gtk_widget_insert_action_group
 gtk_widget_list_action_prefixes
 gtk_widget_get_action_group
+gtk_widget_activate_action
+gtk_widget_activate_default
 gtk_widget_measure
 gtk_widget_snapshot_child
 gtk_widget_get_next_sibling
@@ -4647,8 +4645,6 @@ gtk_window_set_resizable
 gtk_window_get_resizable
 gtk_window_add_accel_group
 gtk_window_remove_accel_group
-gtk_window_activate_focus
-gtk_window_activate_default
 gtk_window_set_modal
 gtk_window_set_default_size
 gtk_window_set_hide_on_close
@@ -4671,7 +4667,7 @@ gtk_window_propagate_key_event
 gtk_window_get_focus
 gtk_window_set_focus
 gtk_window_get_default_widget
-gtk_window_set_default
+gtk_window_set_default_widget
 gtk_window_present
 gtk_window_present_with_time
 gtk_window_close
@@ -6518,6 +6514,7 @@ GtkEventController
 GtkPropagationPhase
 gtk_event_controller_get_propagation_phase
 gtk_event_controller_set_propagation_phase
+gtk_event_controller_get_responsive
 gtk_event_controller_handle_event
 gtk_event_controller_get_widget
 gtk_event_controller_reset
@@ -146,15 +146,48 @@ gdk_event_class_init (GdkEventClass *klass)
  g_object_class_install_properties (object_class, N_PROPS, event_props);
 }

-void
-_gdk_event_emit (GdkEvent *event)
+gboolean
+check_event_sanity (GdkEvent *event)
 {
+  GdkDisplay *display;
+  GdkSurface *surface;
+  GdkDevice *device;
+
+  display = gdk_event_get_display (event);
+  surface = gdk_event_get_surface (event);
+  device = gdk_event_get_device (event);
+
  if (gdk_event_get_event_type (event) == GDK_NOTHING)
    {
      g_warning ("Ignoring GDK_NOTHING events; they're good for nothing");
-      return;
+      return FALSE;
    }

+  if (surface && display != gdk_surface_get_display (surface))
+    {
+      char *type = g_enum_to_string (GDK_TYPE_EVENT_TYPE, event->any.type);
+      g_warning ("Event of type %s with mismatched surface display", type);
+      g_free (type);
+      return FALSE;
+    }
+
+  if (device && display != gdk_device_get_display (device))
+    {
+      char *type = g_enum_to_string (GDK_TYPE_EVENT_TYPE, event->any.type);
+      g_warning ("Event of type %s with mismatched device display", type);
+      g_free (type);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+void
+_gdk_event_emit (GdkEvent *event)
+{
+  if (!check_event_sanity (event))
+    return;
+
  if (gdk_drag_handle_source_event (event))
    return;

@@ -645,5 +645,7 @@ void           gdk_event_set_related_target       (GdkEvent *event,
                                                  GObject  *user_data);
 GObject *      gdk_event_get_related_target      (const GdkEvent *event);

+gboolean       check_event_sanity (GdkEvent *event);
+

 #endif /* __GDK_EVENTS_PRIVATE_H__ */
@@ -116,6 +116,8 @@ typedef struct {

  int use_es;

+  int max_debug_label_length;
+
  GdkGLContextPaintData *paint_data;
 } GdkGLContextPrivate;

@@ -457,11 +459,14 @@ gdk_gl_context_push_debug_group_printf (GdkGLContext *context,

  if (priv->use_khr_debug)
    {
+      int msg_len;
+
      va_start (args, format);
      message = g_strdup_vprintf (format, args);
      va_end (args);

-      glPushDebugGroupKHR (GL_DEBUG_SOURCE_APPLICATION, 0, -1, message);
+      msg_len = MIN (priv->max_debug_label_length, strlen (message) - 1);
+      glPushDebugGroupKHR (GL_DEBUG_SOURCE_APPLICATION, 0, msg_len, message);
      g_free (message);
    }
 }
@@ -500,11 +505,15 @@ gdk_gl_context_label_object_printf  (GdkGLContext *context,

  if (priv->use_khr_debug)
    {
+      int msg_len;
+
      va_start (args, format);
      message = g_strdup_vprintf (format, args);
      va_end (args);

-      glObjectLabel (identifier, name, -1, message);
+      msg_len = MIN (priv->max_debug_label_length, strlen (message) - 1);
+
+      glObjectLabel (identifier, name, msg_len, message);
      g_free (message);
    }
 }
@@ -992,7 +1001,10 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
  display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));

  if (priv->has_khr_debug && GDK_DISPLAY_DEBUG_CHECK (display, GL_DEBUG))
-    priv->use_khr_debug = TRUE;
+    {
+      priv->use_khr_debug = TRUE;
+      glGetIntegerv (GL_MAX_LABEL_LENGTH, &priv->max_debug_label_length);
+    }
  if (!priv->use_es && GDK_DISPLAY_DEBUG_CHECK (display, GL_TEXTURE_RECT))
    priv->use_texture_rectangle = TRUE;
  else if (has_npot)
@@ -293,6 +293,7 @@ gdk_seat_grab (GdkSeat                *seat,

  g_return_val_if_fail (GDK_IS_SEAT (seat), GDK_GRAB_FAILED);
  g_return_val_if_fail (GDK_IS_SURFACE (surface), GDK_GRAB_FAILED);
+  g_return_val_if_fail (gdk_surface_get_display (surface) == gdk_seat_get_display (seat), GDK_GRAB_FAILED);

  capabilities &= GDK_SEAT_CAPABILITY_ALL;
  g_return_val_if_fail (capabilities != GDK_SEAT_CAPABILITY_NONE, GDK_GRAB_FAILED);
@@ -107,6 +107,7 @@ enum {
  PROP_0,
  PROP_CURSOR,
  PROP_DISPLAY,
+  PROP_FRAME_CLOCK,
  PROP_STATE,
  PROP_MAPPED,
  LAST_PROP
@@ -268,6 +269,13 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
                           GDK_TYPE_DISPLAY,
                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);

+  properties[PROP_FRAME_CLOCK] =
+      g_param_spec_object ("frame-clock",
+                           P_("Frame Clock"),
+                           P_("Frame Clock"),
+                           GDK_TYPE_FRAME_CLOCK,
+                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+
  properties[PROP_STATE] =
      g_param_spec_flags ("state",
                          P_("State"),
@@ -462,6 +470,10 @@ gdk_surface_set_property (GObject      *object,
      g_assert (surface->display != NULL);
      break;

+    case PROP_FRAME_CLOCK:
+      gdk_surface_set_frame_clock (surface, GDK_FRAME_CLOCK (g_value_get_object (value)));
+      break;
+
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -486,6 +498,10 @@ gdk_surface_get_property (GObject    *object,
      g_value_set_object (value, surface->display);
      break;

+    case PROP_FRAME_CLOCK:
+      g_value_set_object (value, surface->frame_clock);
+      break;
+
    case PROP_STATE:
      g_value_set_flags (value, surface->state);
      break;
@@ -5028,31 +5028,29 @@ _gdk_wayland_device_get_implicit_grab_serial (GdkWaylandDevice *device,
        }
    }

-    return GDK_WAYLAND_SEAT (seat)->pointer_info.press_serial;
+  return GDK_WAYLAND_SEAT (seat)->pointer_info.press_serial;
 }

 uint32_t
-_gdk_wayland_seat_get_last_implicit_grab_serial (GdkSeat           *seat,
+_gdk_wayland_seat_get_last_implicit_grab_serial (GdkWaylandSeat    *seat,
                                                 GdkEventSequence **sequence)
 {
-  GdkWaylandSeat *wayland_seat;
  GdkWaylandTouchData *touch;
  GHashTableIter iter;
  GList *l;
  uint32_t serial;

-  wayland_seat = GDK_WAYLAND_SEAT (seat);
-  g_hash_table_iter_init (&iter, wayland_seat->touches);
+  g_hash_table_iter_init (&iter, seat->touches);

  if (sequence)
    *sequence = NULL;

-  serial = wayland_seat->keyboard_key_serial;
+  serial = seat->keyboard_key_serial;

-  if (wayland_seat->pointer_info.press_serial > serial)
-    serial = wayland_seat->pointer_info.press_serial;
+  if (seat->pointer_info.press_serial > serial)
+    serial = seat->pointer_info.press_serial;

-  for (l = wayland_seat->tablets; l; l = l->next)
+  for (l = seat->tablets; l; l = l->next)
    {
      GdkWaylandTabletData *tablet = l->data;

@@ -396,6 +396,8 @@ static void gdk_wayland_display_add_output        (GdkWaylandDisplay *display_wa
                                                   guint32            version);
 static void gdk_wayland_display_remove_output     (GdkWaylandDisplay *display_wayland,
                                                   guint32            id);
+static void gdk_wayland_display_init_xdg_output   (GdkWaylandDisplay *display_wayland);
+static void gdk_wayland_display_get_xdg_output    (GdkWaylandMonitor *monitor);

 static void
 gdk_registry_handle_global (void               *data,
@@ -527,6 +529,13 @@ gdk_registry_handle_global (void               *data,
                                                           &server_decoration_listener,
                                                           display_wayland);
    }
+  else if (strcmp(interface, "zxdg_output_manager_v1") == 0)
+    {
+      display_wayland->xdg_output_manager =
+            wl_registry_bind (registry, id, &zxdg_output_manager_v1_interface, 1);
+      gdk_wayland_display_init_xdg_output (display_wayland);
+      _gdk_wayland_display_async_roundtrip (display_wayland);
+    }

  g_hash_table_insert (display_wayland->known_globals,
                       GUINT_TO_POINTER (id), g_strdup (interface));
@@ -2170,6 +2179,123 @@ update_scale (GdkDisplay *display)
  g_list_free (seats);
 }

+static void
+gdk_wayland_display_init_xdg_output (GdkWaylandDisplay *display_wayland)
+{
+  int i;
+
+  GDK_NOTE (MISC,
+            g_message ("init xdg-output support, %d monitor(s) already present",
+                       display_wayland->monitors->len));
+
+  for (i = 0; i < display_wayland->monitors->len; i++)
+    gdk_wayland_display_get_xdg_output (display_wayland->monitors->pdata[i]);
+}
+
+static gboolean
+display_has_xdg_output_support (GdkWaylandDisplay *display_wayland)
+{
+  return (display_wayland->xdg_output_manager != NULL);
+}
+
+static gboolean
+monitor_has_xdg_output (GdkWaylandMonitor *monitor)
+{
+  return (monitor->xdg_output != NULL);
+}
+
+static gboolean
+should_update_monitor (GdkWaylandMonitor *monitor)
+{
+  return (GDK_MONITOR (monitor)->geometry.width != 0 &&
+          monitor->version < OUTPUT_VERSION_WITH_DONE);
+}
+
+static void
+apply_monitor_change (GdkWaylandMonitor *monitor)
+{
+  GDK_NOTE (MISC,
+            g_message ("monitor %d changed position %d %d, size %d %d",
+                       monitor->id,
+                       monitor->x, monitor->y,
+                       monitor->width, monitor->height));
+
+  gdk_monitor_set_position (GDK_MONITOR (monitor), monitor->x, monitor->y);
+  gdk_monitor_set_size (GDK_MONITOR (monitor), monitor->width, monitor->height);
+  monitor->wl_output_done = FALSE;
+  monitor->xdg_output_done = FALSE;
+
+  update_scale (GDK_MONITOR (monitor)->display);
+}
+
+static void
+xdg_output_handle_logical_position (void                  *data,
+                                    struct zxdg_output_v1 *xdg_output,
+                                    int32_t                x,
+                                    int32_t                y)
+{
+  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *) data;
+
+  GDK_NOTE (MISC,
+            g_message ("handle logical position xdg-output %d, position %d %d",
+                       monitor->id, x, y));
+  monitor->x = x;
+  monitor->y = y;
+}
+
+static void
+xdg_output_handle_logical_size (void                  *data,
+                                struct zxdg_output_v1 *xdg_output,
+                                int32_t                width,
+                                int32_t                height)
+{
+  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *) data;
+
+  GDK_NOTE (MISC,
+            g_message ("handle logical size xdg-output %d, size %d %d",
+                       monitor->id, width, height));
+  monitor->width = width;
+  monitor->height = height;
+}
+
+static void
+xdg_output_handle_done (void                  *data,
+                        struct zxdg_output_v1 *xdg_output)
+{
+  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *) data;
+
+  GDK_NOTE (MISC,
+            g_message ("handle done xdg-output %d", monitor->id));
+
+  monitor->xdg_output_done = TRUE;
+  if (monitor->wl_output_done)
+    apply_monitor_change (monitor);
+}
+
+static const struct zxdg_output_v1_listener xdg_output_listener = {
+    xdg_output_handle_logical_position,
+    xdg_output_handle_logical_size,
+    xdg_output_handle_done,
+};
+
+static void
+gdk_wayland_display_get_xdg_output (GdkWaylandMonitor *monitor)
+{
+  GdkDisplay *display = GDK_MONITOR (monitor)->display;
+  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
+
+  GDK_NOTE (MISC,
+            g_message ("get xdg-output for monitor %d", monitor->id));
+
+  monitor->xdg_output =
+    zxdg_output_manager_v1_get_xdg_output (display_wayland->xdg_output_manager,
+                                           monitor->output);
+
+  zxdg_output_v1_add_listener (monitor->xdg_output,
+                               &xdg_output_listener,
+                               monitor);
+}
+
 static void
 output_handle_geometry (void             *data,
                        struct wl_output *wl_output,
@@ -2188,13 +2314,17 @@ output_handle_geometry (void             *data,
            g_message ("handle geometry output %d, position %d %d, phys. size %d %d, subpixel layout %s, manufacturer %s, model %s, transform %s",
                       monitor->id, x, y, physical_width, physical_height, subpixel_to_string (subpixel), make, model, transform_to_string (transform)));

-  gdk_monitor_set_position (GDK_MONITOR (monitor), x, y);
+  monitor->x = x;
+  monitor->y = y;
  gdk_monitor_set_physical_size (GDK_MONITOR (monitor), physical_width, physical_height);
  gdk_monitor_set_subpixel_layout (GDK_MONITOR (monitor), subpixel);
  gdk_monitor_set_manufacturer (GDK_MONITOR (monitor), make);
  gdk_monitor_set_model (GDK_MONITOR (monitor), model);

-  if (GDK_MONITOR (monitor)->geometry.width != 0 && monitor->version < OUTPUT_VERSION_WITH_DONE)
+  if (should_update_monitor (monitor) || !monitor_has_xdg_output (monitor))
+    apply_monitor_change (monitor);
+
+  if (should_update_monitor (monitor))
    update_scale (GDK_MONITOR (monitor)->display);
 }

@@ -2203,19 +2333,14 @@ output_handle_done (void             *data,
                    struct wl_output *wl_output)
 {
  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *)data;
-  GdkDisplay *display = gdk_monitor_get_display (GDK_MONITOR (monitor));

  GDK_NOTE (MISC,
            g_message ("handle done output %d", monitor->id));

-  if (!monitor->added)
-    {
-      monitor->added = TRUE;
-      g_ptr_array_add (GDK_WAYLAND_DISPLAY (display)->monitors, monitor);
-      gdk_display_monitor_added (display, GDK_MONITOR (monitor));
-    }
+  monitor->wl_output_done = TRUE;

-  update_scale (display);
+  if (!monitor_has_xdg_output (monitor) || monitor->xdg_output_done)
+    apply_monitor_change (monitor);
 }

 static void
@@ -2232,6 +2357,9 @@ output_handle_scale (void             *data,
  GDK_NOTE (MISC,
            g_message ("handle scale output %d, scale %d", monitor->id, scale));

+  if (monitor_has_xdg_output (monitor))
+    return;
+
  gdk_monitor_get_geometry (GDK_MONITOR (monitor), &previous_geometry);
  previous_scale = gdk_monitor_get_scale_factor (GDK_MONITOR (monitor));

@@ -2239,10 +2367,11 @@ output_handle_scale (void             *data,
  height = previous_geometry.height * previous_scale;

  gdk_monitor_set_scale_factor (GDK_MONITOR (monitor), scale);
-  gdk_monitor_set_size (GDK_MONITOR (monitor), width / scale, height / scale);
+  monitor->width = width / scale;
+  monitor->height = height / scale;

-  if (GDK_MONITOR (monitor)->geometry.width != 0 && monitor->version < OUTPUT_VERSION_WITH_DONE)
-    update_scale (GDK_MONITOR (monitor)->display);
+  if (should_update_monitor (monitor))
+    apply_monitor_change (monitor);
 }

 static void
@@ -2264,11 +2393,12 @@ output_handle_mode (void             *data,
    return;

  scale = gdk_monitor_get_scale_factor (GDK_MONITOR (monitor));
-  gdk_monitor_set_size (GDK_MONITOR (monitor), width / scale, height / scale);
+  monitor->width = width / scale;
+  monitor->height = height / scale;
  gdk_monitor_set_refresh_rate (GDK_MONITOR (monitor), refresh);

-  if (width != 0 && monitor->version < OUTPUT_VERSION_WITH_DONE)
-    update_scale (GDK_MONITOR (monitor)->display);
+  if (should_update_monitor (monitor) || !monitor_has_xdg_output (monitor))
+    apply_monitor_change (monitor);
 }

 static const struct wl_output_listener output_listener =
@@ -2295,13 +2425,17 @@ gdk_wayland_display_add_output (GdkWaylandDisplay *display_wayland,
  monitor->output = output;
  monitor->version = version;

-  if (monitor->version < OUTPUT_VERSION_WITH_DONE)
-    {
-      g_ptr_array_add (display_wayland->monitors, monitor);
-      gdk_display_monitor_added (GDK_DISPLAY (display_wayland), GDK_MONITOR (monitor));
-    }
+  g_ptr_array_add (display_wayland->monitors, monitor);
+  gdk_display_monitor_added (GDK_DISPLAY (display_wayland), GDK_MONITOR (monitor));

  wl_output_add_listener (output, &output_listener, monitor);
+
+  GDK_NOTE (MISC,
+            g_message ("xdg_output_manager %p",
+                       display_wayland->xdg_output_manager));
+
+  if (display_has_xdg_output_support (display_wayland))
+    gdk_wayland_display_get_xdg_output (monitor);
 }

 struct wl_output *
@@ -35,6 +35,7 @@
 #include <gdk/wayland/xdg-foreign-unstable-v1-client-protocol.h>
 #include <gdk/wayland/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h>
 #include <gdk/wayland/server-decoration-client-protocol.h>
+#include <gdk/wayland/xdg-output-unstable-v1-client-protocol.h>

 #include <glib.h>
 #include <gdk/gdkkeys.h>
@@ -109,6 +110,7 @@ struct _GdkWaylandDisplay
  struct zxdg_importer_v1 *xdg_importer;
  struct zwp_keyboard_shortcuts_inhibit_manager_v1 *keyboard_shortcuts_inhibit;
  struct org_kde_kwin_server_decoration_manager *server_decoration_manager;
+  struct zxdg_output_manager_v1 *xdg_output_manager;

  GList *async_roundtrips;

@@ -151,6 +151,9 @@ _gdk_wayland_display_deliver_event (GdkDisplay *display,
 {
  GList *node;

+  if (!check_event_sanity (event))
+    g_warning ("Snap! delivering insane events\n");
+
  node = _gdk_event_queue_append (display, event);
  _gdk_windowing_got_event (display, node, event,
                            _gdk_display_get_next_serial (display));
@@ -30,6 +30,15 @@ struct _GdkWaylandMonitor {
  guint32 version;
  struct wl_output *output;
  gboolean added;
+
+  struct zxdg_output_v1 *xdg_output;
+  /* Size and position, can be either from wl_output or xdg_output */
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
+  gboolean wl_output_done;
+  gboolean xdg_output_done;
 };

 struct _GdkWaylandMonitorClass {
@@ -34,6 +34,7 @@
 #include <gdk/gdkcursor.h>
 #include <gdk/wayland/gdkwayland.h>
 #include <gdk/wayland/gdkdisplay-wayland.h>
+#include <gdk/wayland/gdkseat-wayland.h>

 #include <xkbcommon/xkbcommon.h>

@@ -138,7 +139,7 @@ void        _gdk_wayland_display_remove_seat    (GdkWaylandDisplay       *displa
 GdkKeymap *_gdk_wayland_device_get_keymap (GdkDevice *device);
 uint32_t _gdk_wayland_device_get_implicit_grab_serial(GdkWaylandDevice *device,
                                                      const GdkEvent   *event);
-uint32_t _gdk_wayland_seat_get_last_implicit_grab_serial (GdkSeat           *seat,
+uint32_t _gdk_wayland_seat_get_last_implicit_grab_serial (GdkWaylandSeat     *seat,
                                                          GdkEventSequence **seqence);
 struct wl_data_device * gdk_wayland_device_get_data_device (GdkDevice *gdk_device);
 void gdk_wayland_device_set_selection (GdkDevice             *gdk_device,
@@ -33,6 +33,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkprivate-wayland.h"
 #include "gdkmonitor-wayland.h"
+#include "gdkseat-wayland.h"
 #include <wayland/xdg-shell-unstable-v6-client-protocol.h>

 #include <stdlib.h>
@@ -861,7 +862,7 @@ gdk_wayland_surface_update_dialogs (GdkSurface *surface)
      GdkSurface *w = l->data;
      GdkSurfaceImplWayland *impl;

-      if (!GDK_IS_SURFACE_IMPL_WAYLAND(w->impl))
+      if (!GDK_IS_SURFACE_IMPL_WAYLAND (w->impl))
        continue;

      impl = GDK_SURFACE_IMPL_WAYLAND (w->impl);
@@ -2185,14 +2186,12 @@ create_simple_positioner (GdkSurface *surface,
 static void
 gdk_wayland_surface_create_xdg_popup (GdkSurface     *surface,
                                      GdkSurface     *parent,
-                                      struct wl_seat *seat)
+                                      GdkWaylandSeat *grab_input_seat)
 {
  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
  GdkSurfaceImplWayland *impl = GDK_SURFACE_IMPL_WAYLAND (surface->impl);
  GdkSurfaceImplWayland *parent_impl = GDK_SURFACE_IMPL_WAYLAND (parent->impl);
  gpointer positioner;
-  GdkSeat *gdk_seat;
-  guint32 serial;

  if (!impl->display_server.wl_surface)
    return;
@@ -2210,10 +2209,11 @@ gdk_wayland_surface_create_xdg_popup (GdkSurface     *surface,
      g_warning ("Can't map popup, already mapped");
      return;
    }
-  if ((display->current_popups &&
-       g_list_last (display->current_popups)->data != parent) ||
-      (!display->current_popups &&
-       !is_realized_toplevel (parent)))
+  if (grab_input_seat &&
+      ((display->current_popups &&
+        g_list_last (display->current_popups)->data != parent) ||
+       (!display->current_popups &&
+        !is_realized_toplevel (parent))))
    {
      g_warning ("Tried to map a popup with a non-top most parent");
      return;
@@ -2264,10 +2264,13 @@ gdk_wayland_surface_create_xdg_popup (GdkSurface     *surface,
      g_assert_not_reached ();
    }

-  if (seat)
+  if (grab_input_seat)
    {
-      gdk_seat = gdk_display_get_default_seat (GDK_DISPLAY (display));
-      serial = _gdk_wayland_seat_get_last_implicit_grab_serial (gdk_seat, NULL);
+      struct wl_seat *seat;
+      guint32 serial;
+
+      seat = gdk_wayland_seat_get_wl_seat (GDK_SEAT (grab_input_seat));
+      serial = _gdk_wayland_seat_get_last_implicit_grab_serial (grab_input_seat, NULL);

      switch (display->shell_variant)
        {
@@ -2288,7 +2291,7 @@ gdk_wayland_surface_create_xdg_popup (GdkSurface     *surface,
  display->current_popups = g_list_append (display->current_popups, surface);
 }

-static struct wl_seat *
+static GdkWaylandSeat *
 find_grab_input_seat (GdkSurface *surface,
                      GdkSurface *transient_for)
 {
@@ -2301,7 +2304,7 @@ find_grab_input_seat (GdkSurface *surface,
   * grab before showing the popup surface.
   */
  if (impl->grab_input_seat)
-    return gdk_wayland_seat_get_wl_seat (impl->grab_input_seat);
+    return GDK_WAYLAND_SEAT (impl->grab_input_seat);

  /* HACK: GtkMenu grabs a special surface known as the "grab transfer surface"
   * and then transfers the grab over to the correct surface later. Look for
@@ -2314,7 +2317,7 @@ find_grab_input_seat (GdkSurface *surface,
    {
      tmp_impl = GDK_SURFACE_IMPL_WAYLAND (attached_grab_surface->impl);
      if (tmp_impl->grab_input_seat)
-        return gdk_wayland_seat_get_wl_seat (tmp_impl->grab_input_seat);
+        return GDK_WAYLAND_SEAT (tmp_impl->grab_input_seat);
    }

  while (transient_for)
@@ -2322,7 +2325,7 @@ find_grab_input_seat (GdkSurface *surface,
      tmp_impl = GDK_SURFACE_IMPL_WAYLAND (transient_for->impl);

      if (tmp_impl->grab_input_seat)
-        return gdk_wayland_seat_get_wl_seat (tmp_impl->grab_input_seat);
+        return GDK_WAYLAND_SEAT (tmp_impl->grab_input_seat);

      transient_for = tmp_impl->transient_for;
    }
@@ -2418,7 +2421,7 @@ gdk_wayland_surface_map (GdkSurface *surface)
  if (should_map_as_popup (surface))
    {
      gboolean create_fallback = FALSE;
-      struct wl_seat *grab_input_seat;
+      GdkWaylandSeat *grab_input_seat;

      /* Popup menus can appear without a transient parent, which means they
       * cannot be positioned properly on Wayland. This attempts to guess the
@@ -2492,8 +2495,8 @@ gdk_wayland_surface_map (GdkSurface *surface)
      if (!create_fallback)
        {
          gdk_wayland_surface_create_xdg_popup (surface,
-                                               transient_for,
-                                               grab_input_seat);
+                                                transient_for,
+                                                grab_input_seat);
        }
      else
        {
@@ -3581,7 +3584,7 @@ gdk_wayland_surface_begin_resize_drag (GdkSurface     *surface,
  if (!is_realized_toplevel (surface))
    return;

-  serial = _gdk_wayland_seat_get_last_implicit_grab_serial (gdk_device_get_seat (device),
+  serial = _gdk_wayland_seat_get_last_implicit_grab_serial (GDK_WAYLAND_SEAT (gdk_device_get_seat (device)),
                                                            &sequence);

  switch (display_wayland->shell_variant)
@@ -3632,7 +3635,7 @@ gdk_wayland_surface_begin_move_drag (GdkSurface *surface,
  if (!is_realized_toplevel (surface))
    return;

-  serial = _gdk_wayland_seat_get_last_implicit_grab_serial (gdk_device_get_seat (device),
+  serial = _gdk_wayland_seat_get_last_implicit_grab_serial (GDK_WAYLAND_SEAT (gdk_device_get_seat (device)),
                                                            &sequence);
  switch (display_wayland->shell_variant)
    {
@@ -58,6 +58,7 @@ proto_sources = [
  ['tablet', 'unstable', 'v2', ],
  ['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
  ['server-decoration', 'private' ],
+  ['xdg-output', 'unstable', 'v1', ],
 ]

 gdk_wayland_gen_headers = []
@@ -31,7 +31,7 @@

 G_DEFINE_TYPE (GdkWin32CairoContext, gdk_win32_cairo_context, GDK_TYPE_CAIRO_CONTEXT)

-static void
+void
 gdk_win32_surface_get_queued_window_rect (GdkSurface *surface,
                                          gint        scale,
                                          RECT       *return_window_rect)
@@ -53,7 +53,7 @@ gdk_win32_surface_get_queued_window_rect (GdkSurface *surface,
  *return_window_rect = window_rect;
 }

-static void
+void
 gdk_win32_surface_apply_queued_move_resize (GdkSurface *surface,
                                            RECT        window_rect)
 {
@@ -166,6 +166,27 @@ gdk_win32_gl_context_begin_frame (GdkDrawContext *draw_context,
 {
  GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
  GdkSurface *surface;
+  GdkSurfaceImplWin32 *impl;
+  RECT queued_window_rect;
+
+  surface = gdk_gl_context_get_surface (context);
+  impl = GDK_SURFACE_IMPL_WIN32 (surface->impl);
+
+  gdk_win32_surface_get_queued_window_rect (surface,
+                                            gdk_surface_get_scale_factor (surface),
+                                            &queued_window_rect);
+
+  /* Apply queued resizes GL windows before painting them
+   *  (we paint on the window DC directly, it must have the right size).
+   * Due to some poorly-understood issue delayed
+   * resizing of double-buffered windows can produce weird
+   * artefacts, so these are also resized before we paint.
+   */
+  if (impl->drag_move_resize_context.native_move_resize_pending)
+    {
+      impl->drag_move_resize_context.native_move_resize_pending = FALSE;
+      gdk_win32_surface_apply_queued_move_resize (surface, queued_window_rect);
+    }

  GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_parent_class)->begin_frame (draw_context, update_area);
  if (gdk_gl_context_get_shared_context (context))
@@ -176,7 +197,6 @@ gdk_win32_gl_context_begin_frame (GdkDrawContext *draw_context,

  /* If nothing else is known, repaint everything so that the back
     buffer is fully up-to-date for the swapbuffer */
-  surface = gdk_gl_context_get_surface (context);
  cairo_region_union_rectangle (update_area, &(GdkRectangle) {
                                                 0, 0,
                                                 gdk_surface_get_width (surface),
@@ -384,6 +384,15 @@ void  _gdk_win32_update_layered_window_from_cache (GdkSurface *window,
                                                   gboolean    do_paint);


+void
+gdk_win32_surface_get_queued_window_rect (GdkSurface *surface,
+                                          gint        scale,
+                                          RECT       *return_window_rect);
+
+void
+gdk_win32_surface_apply_queued_move_resize (GdkSurface *surface,
+                                            RECT        window_rect);
+
 G_END_DECLS

 #endif /* __GDK_SURFACE_WIN32_H__ */
@@ -31,8 +31,8 @@



-#define APPEARS_FOCUSED(toplevel)                           \
-  ((toplevel)->has_focus || (toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
+#define HAS_FOCUS(toplevel)                           \
+  ((toplevel)->has_focus || (toplevel)->has_pointer_focus)

 static void    gdk_x11_device_manager_core_finalize    (GObject *object);
 static void    gdk_x11_device_manager_core_constructed (GObject *object);
@@ -752,7 +752,7 @@ _gdk_device_manager_core_handle_focus (GdkSurface *surface,
  if (toplevel->focus_window == original)
    return;

-  had_focus = APPEARS_FOCUSED (toplevel);
+  had_focus = HAS_FOCUS (toplevel);
  x11_screen = GDK_X11_SCREEN (GDK_SURFACE_SCREEN (surface));

  switch (detail)
@@ -814,7 +814,7 @@ _gdk_device_manager_core_handle_focus (GdkSurface *surface,
      break;
    }

-  if (APPEARS_FOCUSED (toplevel) != had_focus)
+  if (HAS_FOCUS (toplevel) != had_focus)
    {
      GdkEvent *event;

@@ -36,8 +36,8 @@ static void     gdk_event_source_finalize (GSource     *source);

 static GQuark quark_needs_enter = 0;

-#define APPEARS_FOCUSED(toplevel)                           \
-  ((toplevel)->has_focus || (toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
+#define HAS_FOCUS(toplevel)                           \
+  ((toplevel)->has_focus || (toplevel)->has_pointer_focus)

 struct _GdkEventSource
 {
@@ -108,10 +108,10 @@ handle_focus_change (GdkEventCrossing *event)
  if (!event->focus || toplevel->has_focus_window)
    return;

-  had_focus = APPEARS_FOCUSED (toplevel);
+  had_focus = HAS_FOCUS (toplevel);
  toplevel->has_pointer_focus = focus_in;

-  if (APPEARS_FOCUSED (toplevel) != had_focus)
+  if (HAS_FOCUS (toplevel) != had_focus)
    {
      GdkEvent *focus_event;

@@ -1867,6 +1867,14 @@ gdk_x11_surface_set_modal_hint (GdkSurface *surface,
 			     NULL);
 }

+/**
+ * gdk_x11_surface_set_skip_taskbar_hint:
+ * @surface: (type GdkX11Surface): a native #GdkSurface
+ * @skips_taskbar: %TRUE to skip taskbars
+ *
+ * Sets a hint on @surface that taskbars should not
+ * display it. See the EWMH for details.
+ */
 void
 gdk_x11_surface_set_skip_taskbar_hint (GdkSurface *surface,
                                       gboolean    skips_taskbar)
@@ -1888,6 +1896,14 @@ gdk_x11_surface_set_skip_taskbar_hint (GdkSurface *surface,
 			     NULL);
 }

+/**
+ * gdk_x11_surface_set_skip_pager_hint:
+ * @surface: (type GdkX11Surface): a #GdkSurface
+ * @skips_pager: %TRUE to skip pagers
+ *
+ * Sets a hint on @surface that pagers should not
+ * display it. See the EWMH for details.
+ */
 void
 gdk_x11_surface_set_skip_pager_hint (GdkSurface *surface,
                                     gboolean    skips_pager)
@@ -1909,6 +1925,14 @@ gdk_x11_surface_set_skip_pager_hint (GdkSurface *surface,
 			     NULL);
 }

+/**
+ * gdk_x11_surface_set_urgency_hint:
+ * @surface: (type GdkX11Surface): a native #GdkSurface
+ * @urgent: %TRUE to indicate urgenct attention needed
+ *
+ * Sets a hint on @surface that it needs user attention.
+ * See the ICCCM for details.
+ */
 void
 gdk_x11_surface_set_urgency_hint (GdkSurface *surface,
                                  gboolean    urgent)
@@ -3377,6 +3401,14 @@ gdk_x11_surface_get_group (GdkSurface *surface)
  return toplevel->group_leader;
 }

+/**
+ * gdk_x11_surface_set_group:
+ * @surface: (type GdkX11Surface): a native #GdkSurface
+ * @leader: a #GdkSurface
+ *
+ * Sets the group leader of @surface to be @leader.
+ * See the ICCCM for details.
+ */
 void
 gdk_x11_surface_set_group (GdkSurface *surface,
                           GdkSurface *leader)
@@ -535,8 +535,6 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self,
    }

  t = create_texture (self, gdk_texture_get_width (texture), gdk_texture_get_height (texture));
-  gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, t->texture_id,
-                                      "GdkTexture<%p> %d", texture, t->texture_id);

  if (gdk_texture_set_render_data (texture, self, t, gsk_gl_driver_release_texture))
    t->user = texture;
@@ -547,6 +545,9 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self,
                                           surface,
                                           min_filter,
                                           mag_filter);
+  gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, t->texture_id,
+                                      "GdkTexture<%p> %d", texture, t->texture_id);
+
  cairo_surface_destroy (surface);

  return t->texture_id;
@@ -326,6 +326,7 @@ struct _GskGLRenderer
      Program unblurred_outset_shadow_program;
      Program border_program;
      Program cross_fade_program;
+      Program blend_program;
    };
  };

@@ -479,14 +480,14 @@ render_fallback_node (GskGLRenderer       *self,
  texture_id = gsk_gl_driver_create_texture (self->gl_driver,
                                             surface_width,
                                             surface_height);
-  gdk_gl_context_label_object_printf  (self->gl_context, GL_TEXTURE, texture_id,
-                                       "Fallback %s %d", node->node_class->type_name, texture_id);
-
  gsk_gl_driver_bind_source_texture (self->gl_driver, texture_id);
  gsk_gl_driver_init_texture_with_surface (self->gl_driver,
                                           texture_id,
                                           surface,
                                           GL_NEAREST, GL_NEAREST);
+  gdk_gl_context_label_object_printf  (self->gl_context, GL_TEXTURE, texture_id,
+                                       "Fallback %s %d", node->node_class->type_name, texture_id);
+

  cairo_surface_destroy (surface);

@@ -1431,10 +1432,10 @@ render_outset_shadow_node (GskGLRenderer       *self,
      GskRoundedRect blit_clip;

      texture_id = gsk_gl_driver_create_texture (self->gl_driver, texture_width, texture_height);
-      gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id,
-                                          "Outset Shadow Temp %d", texture_id);
      gsk_gl_driver_bind_source_texture (self->gl_driver, texture_id);
      gsk_gl_driver_init_texture_empty (self->gl_driver, texture_id);
+      gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id,
+                                          "Outset Shadow Temp %d", texture_id);
      render_target = gsk_gl_driver_create_render_target (self->gl_driver, texture_id, FALSE, FALSE);
      gdk_gl_context_label_object_printf  (self->gl_context, GL_FRAMEBUFFER, render_target,
                                           "Outset Shadow FB Temp %d", render_target);
@@ -1468,10 +1469,10 @@ render_outset_shadow_node (GskGLRenderer       *self,
      });

      blurred_texture_id = gsk_gl_driver_create_permanent_texture (self->gl_driver, texture_width, texture_height);
-      gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, blurred_texture_id,
-                                          "Outset Shadow Cache %d", blurred_texture_id);
      gsk_gl_driver_bind_source_texture (self->gl_driver, blurred_texture_id);
      gsk_gl_driver_init_texture_empty (self->gl_driver, blurred_texture_id);
+      gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, blurred_texture_id,
+                                          "Outset Shadow Cache %d", blurred_texture_id);
      blurred_render_target = gsk_gl_driver_create_render_target (self->gl_driver, blurred_texture_id, TRUE, TRUE);
      gdk_gl_context_label_object_printf  (self->gl_context, GL_FRAMEBUFFER, render_target,
                                           "Outset Shadow Cache FB %d", render_target);
@@ -1900,6 +1901,54 @@ render_cross_fade_node (GskGLRenderer       *self,
  ops_draw (builder, vertex_data);
 }

+static inline void
+render_blend_node (GskGLRenderer   *self,
+                   GskRenderNode   *node,
+                   RenderOpBuilder *builder)
+{
+  GskRenderNode *top_child = gsk_blend_node_get_top_child (node);
+  GskRenderNode *bottom_child = gsk_blend_node_get_bottom_child (node);
+  const float min_x = builder->dx + node->bounds.origin.x;
+  const float min_y = builder->dy + node->bounds.origin.y;
+  const float max_x = min_x + node->bounds.size.width;
+  const float max_y = min_y + node->bounds.size.height;
+  int top_texture_id;
+  int bottom_texture_id;
+  gboolean is_offscreen1, is_offscreen2;
+  RenderOp op;
+  const GskQuadVertex vertex_data[GL_N_VERTICES] = {
+    { { min_x, min_y }, { 0, 1 }, },
+    { { min_x, max_y }, { 0, 0 }, },
+    { { max_x, min_y }, { 1, 1 }, },
+
+    { { max_x, max_y }, { 1, 0 }, },
+    { { min_x, max_y }, { 0, 0 }, },
+    { { max_x, min_y }, { 1, 1 }, },
+  };
+
+  /* TODO: We create 2 textures here as big as the blend node, but both the
+   * start and the end node might be a lot smaller than that. */
+  add_offscreen_ops (self, builder,
+                     &node->bounds,
+                     bottom_child,
+                     &bottom_texture_id, &is_offscreen1,
+                     FORCE_OFFSCREEN | RESET_CLIP);
+
+  add_offscreen_ops (self, builder,
+                     &node->bounds,
+                     top_child,
+                     &top_texture_id, &is_offscreen2,
+                     FORCE_OFFSCREEN | RESET_CLIP);
+
+  ops_set_program (builder, &self->blend_program);
+  ops_set_texture (builder, bottom_texture_id);
+  op.op = OP_CHANGE_BLEND;
+  op.blend.source2 = top_texture_id;
+  op.blend.mode = gsk_blend_node_get_blend_mode (node);
+  ops_add (builder, &op);
+  ops_draw (builder, vertex_data);
+}
+
 static inline void
 apply_viewport_op (const Program  *program,
                   const RenderOp *op)
@@ -2174,6 +2223,18 @@ apply_cross_fade_op (const Program  *program,
  glUniform1f (program->cross_fade.progress_location, op->cross_fade.progress);
 }

+static inline void
+apply_blend_op (const Program  *program,
+                const RenderOp *op)
+{
+  /* End texture id */
+  glUniform1i (program->blend.source2_location, 1);
+  glActiveTexture (GL_TEXTURE0 + 1);
+  glBindTexture (GL_TEXTURE_2D, op->blend.source2);
+  /* progress */
+  glUniform1i (program->blend.mode_location, op->blend.mode);
+}
+
 static void
 gsk_gl_renderer_dispose (GObject *gobject)
 {
@@ -2206,6 +2267,7 @@ gsk_gl_renderer_create_programs (GskGLRenderer  *self,
    { "unblurred outset shadow",   "unblurred_outset_shadow.fs.glsl" },
    { "border",          "border.fs.glsl" },
    { "cross fade",      "cross_fade.fs.glsl" },
+    { "blend",           "blend.fs.glsl" },
  };

  builder = gsk_shader_builder_new ();
@@ -2336,6 +2398,10 @@ gsk_gl_renderer_create_programs (GskGLRenderer  *self,
  INIT_PROGRAM_UNIFORM_LOCATION (cross_fade, progress);
  INIT_PROGRAM_UNIFORM_LOCATION (cross_fade, source2);

+  /* blend */
+  INIT_PROGRAM_UNIFORM_LOCATION (blend, source2);
+  INIT_PROGRAM_UNIFORM_LOCATION (blend, mode);
+
  g_object_unref (builder);
  return TRUE;
 }
@@ -2588,8 +2654,11 @@ gsk_gl_renderer_add_render_ops (GskGLRenderer   *self,
      render_cross_fade_node (self, node, builder);
    break;

-    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
    case GSK_BLEND_NODE:
+      render_blend_node (self, node, builder);
+    break;
+
+    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
    case GSK_REPEAT_NODE:
    case GSK_CAIRO_NODE:
    default:
@@ -2855,6 +2924,11 @@ gsk_gl_renderer_render_ops (GskGLRenderer *self,
          apply_cross_fade_op (program, op);
          break;

+        case OP_CHANGE_BLEND:
+          g_assert (program == &self->blend_program);
+          apply_blend_op (program, op);
+          break;
+
        case OP_CHANGE_LINEAR_GRADIENT:
          apply_linear_gradient_op (program, op);
          break;
@@ -11,7 +11,7 @@
 #include "gskrendernodeprivate.h"

 #define GL_N_VERTICES 6
-#define GL_N_PROGRAMS 11
+#define GL_N_PROGRAMS 12



@@ -61,6 +61,7 @@ enum {
  OP_DUMP_FRAMEBUFFER       =  23,
  OP_PUSH_DEBUG_GROUP       =  24,
  OP_POP_DEBUG_GROUP        =  25,
+  OP_CHANGE_BLEND           =  26,
 };

 typedef struct
@@ -136,6 +137,10 @@ typedef struct
      int source2_location;
      int progress_location;
    } cross_fade;
+    struct {
+      int source2_location;
+      int mode_location;
+    } blend;
  };

 } Program;
@@ -214,6 +219,10 @@ typedef struct
      float progress;
      int source2;
    } cross_fade;
+    struct {
+      int source2;
+      int mode;
+    } blend;
    struct {
      char *filename;
      int width;
@@ -580,22 +580,32 @@ gsk_border_node_draw (GskRenderNode *node,
       * Note that the call to cairo_fill() will add the potential final
       * segment by closing the path, so we don't have to care.
       */
-      float dst = MIN (bounds->size.width, bounds->size.height) / 2.0;
      cairo_pattern_t *mesh;
      cairo_matrix_t mat;
+      graphene_point_t tl, br;
+      float scale;

      mesh = cairo_pattern_create_mesh ();
      cairo_matrix_init_translate (&mat, -bounds->origin.x, -bounds->origin.y);
      cairo_pattern_set_matrix (mesh, &mat);

+      scale = MIN (bounds->size.width / (self->border_width[1] + self->border_width[3]),
+                   bounds->size.height / (self->border_width[0] + self->border_width[2]));
+      graphene_point_init (&tl,
+                           self->border_width[3] * scale,
+                           self->border_width[0] * scale);
+      graphene_point_init (&br,
+                           bounds->size.width - self->border_width[1] * scale,
+                           bounds->size.height - self->border_width[2] * scale);
+
      /* Top */
      if (self->border_width[0] > 0)
        {
          gsk_border_node_mesh_add_patch (mesh,
                                          &self->border_color[0],
                                          0, 0,
-                                          dst * self->border_width[3] / self->border_width[0], dst,
-                                          bounds->size.width - dst * self->border_width[1] / self->border_width[0], dst,
+                                          tl.x, tl.y,
+                                          br.x, tl.y,
                                          bounds->size.width, 0);
        }

@@ -605,8 +615,8 @@ gsk_border_node_draw (GskRenderNode *node,
          gsk_border_node_mesh_add_patch (mesh,
                                          &self->border_color[1],
                                          bounds->size.width, 0,
-                                          bounds->size.width - dst, dst * self->border_width[0] / self->border_width[1],
-                                          bounds->size.width - dst, bounds->size.height - dst * self->border_width[2] / self->border_width[1],
+                                          br.x, tl.y,
+                                          br.x, br.y,
                                          bounds->size.width, bounds->size.height);
        }

@@ -616,8 +626,8 @@ gsk_border_node_draw (GskRenderNode *node,
          gsk_border_node_mesh_add_patch (mesh,
                                          &self->border_color[2],
                                          0, bounds->size.height,
-                                          dst * self->border_width[3] / self->border_width[2], bounds->size.height - dst,
-                                          bounds->size.width - dst * self->border_width[1] / self->border_width[2], bounds->size.height - dst,
+                                          tl.x, br.y,
+                                          br.x, br.y,
                                          bounds->size.width, bounds->size.height);
        }

@@ -627,8 +637,8 @@ gsk_border_node_draw (GskRenderNode *node,
          gsk_border_node_mesh_add_patch (mesh,
                                          &self->border_color[3],
                                          0, 0,
-                                          dst, dst * self->border_width[0] / self->border_width[3],
-                                          dst, bounds->size.height - dst * self->border_width[2] / self->border_width[3],
+                                          tl.x, tl.y,
+                                          tl.x, br.y,
                                          0, bounds->size.height);
        }

@@ -197,9 +197,10 @@ gsk_rounded_rect_offset (GskRoundedRect *self,
 }

 static void
-border_radius_shrink (graphene_size_t *corner,
-                      double           width,
-                      double           height)
+border_radius_shrink (graphene_size_t       *corner,
+                      double                 width,
+                      double                 height,
+                      const graphene_size_t *max)
 {
  if (corner->width > 0)
    corner->width -= width;
@@ -211,6 +212,11 @@ border_radius_shrink (graphene_size_t *corner,
      corner->width = 0;
      corner->height = 0;
    }
+  else
+    {
+      corner->width = MIN (corner->width, max->width);
+      corner->height = MIN (corner->height, max->height);
+    }
 }

 /**
@@ -260,10 +266,10 @@ gsk_rounded_rect_shrink (GskRoundedRect *self,
      self->bounds.size.height -= top + bottom;
    }

-  border_radius_shrink (&self->corner[GSK_CORNER_TOP_LEFT], left, top);
-  border_radius_shrink (&self->corner[GSK_CORNER_TOP_RIGHT], right, top);
-  border_radius_shrink (&self->corner[GSK_CORNER_BOTTOM_RIGHT], right, bottom);
-  border_radius_shrink (&self->corner[GSK_CORNER_BOTTOM_LEFT], left, bottom);
+  border_radius_shrink (&self->corner[GSK_CORNER_TOP_LEFT], left, top, &self->bounds.size);
+  border_radius_shrink (&self->corner[GSK_CORNER_TOP_RIGHT], right, top, &self->bounds.size);
+  border_radius_shrink (&self->corner[GSK_CORNER_BOTTOM_RIGHT], right, bottom, &self->bounds.size);
+  border_radius_shrink (&self->corner[GSK_CORNER_BOTTOM_LEFT], left, bottom, &self->bounds.size);

  return self;
 }
@@ -19,7 +19,7 @@


 /**
- * SECTION:gsktransform
+ * SECTION:GskTransform
 * @Title: GskTransform
 * @Short_description: A description for transform operations
 *
@@ -42,8 +42,7 @@ typedef struct _GskTransformClass GskTransformClass;
 struct _GskTransform
 {
  const GskTransformClass *transform_class;
-  
-  volatile int ref_count;
+
  GskTransformCategory category;
  GskTransform *next;
 };
@@ -113,10 +112,9 @@ gsk_transform_alloc (const GskTransformClass *transform_class,

  g_return_val_if_fail (transform_class != NULL, NULL);

-  self = g_malloc0 (transform_class->struct_size);
+  self = g_atomic_rc_box_alloc0 (transform_class->struct_size);

  self->transform_class = transform_class;
-  self->ref_count = 1;
  self->category = next ? MIN (category, next->category) : category;
  self->next = gsk_transform_is_identity (next) ? NULL : next;

@@ -312,15 +310,15 @@ gsk_matrix_transform_apply_affine (GskTransform *transform,
      break;

    case GSK_TRANSFORM_CATEGORY_2D_AFFINE:
-      *out_dx += *out_scale_x * graphene_matrix_get_value (&self->matrix, 3, 0);
-      *out_dy += *out_scale_y * graphene_matrix_get_value (&self->matrix, 3, 1);
-      *out_scale_x *= graphene_matrix_get_value (&self->matrix, 0, 0);
-      *out_scale_y *= graphene_matrix_get_value (&self->matrix, 1, 1);
+      *out_dx += *out_scale_x * graphene_matrix_get_x_translation (&self->matrix);
+      *out_dy += *out_scale_y * graphene_matrix_get_y_translation (&self->matrix);
+      *out_scale_x *= graphene_matrix_get_x_scale (&self->matrix);
+      *out_scale_y *= graphene_matrix_get_y_scale (&self->matrix);
      break;

    case GSK_TRANSFORM_CATEGORY_2D_TRANSLATE:
-      *out_dx += *out_scale_x * graphene_matrix_get_value (&self->matrix, 3, 0);
-      *out_dy += *out_scale_y * graphene_matrix_get_value (&self->matrix, 3, 1);
+      *out_dx += *out_scale_x * graphene_matrix_get_x_translation (&self->matrix);
+      *out_dy += *out_scale_y * graphene_matrix_get_y_translation (&self->matrix);
      break;

    case GSK_TRANSFORM_CATEGORY_IDENTITY:
@@ -347,8 +345,8 @@ gsk_matrix_transform_apply_translate (GskTransform *transform,
      break;

    case GSK_TRANSFORM_CATEGORY_2D_TRANSLATE:
-      *out_dx += graphene_matrix_get_value (&self->matrix, 3, 0);
-      *out_dy += graphene_matrix_get_value (&self->matrix, 3, 1);
+      *out_dx += graphene_matrix_get_x_translation (&self->matrix);
+      *out_dy += graphene_matrix_get_y_translation (&self->matrix);
      break;

    case GSK_TRANSFORM_CATEGORY_IDENTITY:
@@ -421,8 +419,10 @@ gsk_matrix_transform_equal (GskTransform *first_transform,
  GskMatrixTransform *first = (GskMatrixTransform *) first_transform;
  GskMatrixTransform *second = (GskMatrixTransform *) second_transform;

-  /* Crude, but better than just returning FALSE */
-  return memcmp (&first->matrix, &second->matrix, sizeof (graphene_matrix_t)) == 0;
+  if (graphene_matrix_equal_fast (&first->matrix, &second->matrix))
+    return TRUE;
+
+  return graphene_matrix_equal (&first->matrix, &second->matrix);
 }

 static const GskTransformClass GSK_TRANSFORM_TRANSFORM_CLASS =
@@ -735,7 +735,7 @@ gsk_rotate_transform_equal (GskTransform *first_transform,
  GskRotateTransform *first = (GskRotateTransform *) first_transform;
  GskRotateTransform *second = (GskRotateTransform *) second_transform;

-  return first->angle == second->angle;
+  return G_APPROX_VALUE (first->angle, second->angle, 0.01f);
 }

 static void
@@ -837,8 +837,8 @@ gsk_rotate3d_transform_equal (GskTransform *first_transform,
  GskRotate3dTransform *first = (GskRotate3dTransform *) first_transform;
  GskRotate3dTransform *second = (GskRotate3dTransform *) second_transform;

-  return first->angle == second->angle
-         && graphene_vec3_equal (&first->axis, &second->axis);
+  return G_APPROX_VALUE (first->angle, second->angle, 0.01f) &&
+         graphene_vec3_equal (&first->axis, &second->axis);
 }

 static void
@@ -996,9 +996,9 @@ gsk_scale_transform_equal (GskTransform *first_transform,
  GskScaleTransform *first = (GskScaleTransform *) first_transform;
  GskScaleTransform *second = (GskScaleTransform *) second_transform;

-  return first->factor_x == second->factor_x
-         && first->factor_y == second->factor_y
-         && first->factor_z == second->factor_z;
+  return G_APPROX_VALUE (first->factor_x, second->factor_x, 0.01f) &&
+         G_APPROX_VALUE (first->factor_y, second->factor_y, 0.01f) &&
+         G_APPROX_VALUE (first->factor_z, second->factor_z, 0.01f);
 }

 static void
@@ -1150,7 +1150,7 @@ gsk_perspective_transform_equal (GskTransform *first_transform,
  GskPerspectiveTransform *first = (GskPerspectiveTransform *) first_transform;
  GskPerspectiveTransform *second = (GskPerspectiveTransform *) second_transform;

-  return first->depth == second->depth;
+  return G_APPROX_VALUE (first->depth, second->depth, 0.001f);
 }

 static void
@@ -1217,8 +1217,6 @@ gsk_transform_finalize (GskTransform *self)
  self->transform_class->finalize (self);

  gsk_transform_unref (self->next);
-
-  g_free (self);
 }

 /**
@@ -1235,9 +1233,7 @@ gsk_transform_ref (GskTransform *self)
  if (self == NULL)
    return NULL;

-  g_atomic_int_inc (&self->ref_count);
-
-  return self;
+  return g_atomic_rc_box_acquire (self);
 }

 /**
@@ -1255,8 +1251,7 @@ gsk_transform_unref (GskTransform *self)
  if (self == NULL)
    return;

-  if (g_atomic_int_dec_and_test (&self->ref_count))
-    gsk_transform_finalize (self);
+  g_atomic_rc_box_release_full (self, (GDestroyNotify) gsk_transform_finalize);
 }

 /**
@@ -11,6 +11,7 @@ gsk_private_gl_shaders = [
  'resources/glsl/unblurred_outset_shadow.fs.glsl',
  'resources/glsl/border.fs.glsl',
  'resources/glsl/cross_fade.fs.glsl',
+  'resources/glsl/blend.fs.glsl',
  'resources/glsl/es2_common.fs.glsl',
  'resources/glsl/es2_common.vs.glsl',
  'resources/glsl/gl3_common.fs.glsl',
@@ -0,0 +1,287 @@
+uniform int u_mode;
+uniform sampler2D u_source2;
+
+float
+combine (float source, float backdrop)
+{
+  return source + backdrop * (1 - source);
+}
+
+vec4
+composite (vec4 Cs, vec4 Cb, vec3 B)
+{
+  float ao = Cs.a + Cb.a * (1 - Cs.a);
+  vec3 Co = (Cs.a*(1 - Cb.a)*Cs.rgb + Cs.a*Cb.a*B + (1 - Cs.a)*Cb.a*Cb.rgb) / ao;
+  return vec4(Co, ao);
+}
+
+vec4
+normal (vec4 Cs, vec4 Cb)
+{
+  return composite (Cs, Cb, Cs.rgb);
+}
+
+vec4
+multiply (vec4 Cs, vec4 Cb)
+{
+  return composite (Cs, Cb, Cs.rgb * Cb.rgb);
+}
+
+vec4
+difference (vec4 Cs, vec4 Cb)
+{
+  return composite (Cs, Cb, abs(Cs.rgb - Cb.rgb));
+}
+
+vec4
+screen (vec4 Cs, vec4 Cb)
+{
+  return composite (Cs, Cb, Cs.rgb + Cb.rgb - Cs.rgb * Cb.rgb);
+}
+
+float
+hard_light (float source, float backdrop)
+{
+  if (source <= 0.5)
+    return 2 * backdrop * source;
+  else
+    return 2 * (backdrop + source - backdrop * source) - 1;
+}
+
+vec4
+hard_light (vec4 Cs, vec4 Cb)
+{
+  vec3 B = vec3 (hard_light (Cs.r, Cb.r),
+                 hard_light (Cs.g, Cb.g),
+                 hard_light (Cs.b, Cb.b));
+  return composite (Cs, Cb, B);
+}
+
+float
+soft_light (float source, float backdrop)
+{
+  float db;
+
+  if (backdrop <= 0.25)
+    db = ((16 * backdrop - 12) * backdrop + 4) * backdrop;
+  else
+    db = sqrt (backdrop);
+
+  if (source <= 0.5)
+    return backdrop - (1 - 2 * source) * backdrop * (1 - backdrop);
+  else
+    return backdrop + (2 * source - 1) * (db - backdrop);
+}
+
+vec4
+soft_light (vec4 Cs, vec4 Cb)
+{
+  vec3 B = vec3 (soft_light (Cs.r, Cb.r),
+                 soft_light (Cs.g, Cb.g),
+                 soft_light (Cs.b, Cb.b));
+  return composite (Cs, Cb, B);
+}
+
+vec4
+overlay (vec4 Cs, vec4 Cb)
+{
+  vec3 B = vec3 (hard_light (Cb.r, Cs.r),
+                 hard_light (Cb.g, Cs.g),
+                 hard_light (Cb.b, Cs.b));
+  return composite (Cs, Cb, B);
+}
+
+vec4
+darken (vec4 Cs, vec4 Cb)
+{
+  vec3 B = min (Cs.rgb, Cb.rgb);
+  return composite (Cs, Cb, B);
+}
+
+vec4
+lighten (vec4 Cs, vec4 Cb)
+{
+  vec3 B = max (Cs.rgb, Cb.rgb);
+  return composite (Cs, Cb, B);
+}
+
+float
+color_dodge (float source, float backdrop)
+{
+  return (source == 1.0) ? source : min (backdrop / (1.0 - source), 1.0);
+}
+
+vec4
+color_dodge (vec4 Cs, vec4 Cb)
+{
+  vec3 B = vec3 (color_dodge (Cs.r, Cb.r),
+                 color_dodge (Cs.g, Cb.g),
+                 color_dodge (Cs.b, Cb.b));
+  return composite (Cs, Cb, B);
+}
+
+
+float
+color_burn (float source, float backdrop)
+{
+  return (source == 0.0) ? source : max ((1.0 - ((1.0 - backdrop) / source)), 0.0);
+}
+
+vec4
+color_burn (vec4 Cs, vec4 Cb)
+{
+  vec3 B = vec3 (color_burn (Cs.r, Cb.r),
+                 color_burn (Cs.g, Cb.g),
+                 color_burn (Cs.b, Cb.b));
+  return composite (Cs, Cb, B);
+}
+
+vec4
+exclusion (vec4 Cs, vec4 Cb)
+{
+  vec3 B = Cb.rgb + Cs.rgb - 2.0 * Cb.rgb * Cs.rgb;
+  return composite (Cs, Cb, B);
+}
+
+float
+lum (vec3 c)
+{
+  return 0.3 * c.r + 0.59 * c.g + 0.11 * c.b;
+}
+
+vec3
+clip_color (vec3 c)
+{
+  float l = lum (c);
+  float n = min (c.r, min (c.g, c.b));
+  float x = max (c.r, max (c.g, c.b));
+  if (n < 0) c = l + (((c - l) * l) / (l - n));
+  if (x > 1) c = l + (((c - l) * (1 - l)) / (x - l));
+  return c;
+}
+
+vec3
+set_lum (vec3 c, float l)
+{
+  float d = l - lum (c);
+  return clip_color (vec3 (c.r + d, c.g + d, c.b + d));
+}
+
+float
+sat (vec3 c)
+{
+  return max (c.r, max (c.g, c.b)) - min (c.r, min (c.g, c.b));
+}
+
+vec3
+set_sat (vec3 c, float s)
+{
+  float cmin = min (c.r, min (c.g, c.b));
+  float cmax = max (c.r, max (c.g, c.b));
+  vec3 res;
+
+  if (cmax == cmin)
+    res = vec3 (0, 0, 0);
+  else
+    {
+      if (c.r == cmax)
+        {
+          if (c.g == cmin)
+            {
+              res.b = ((c.b - cmin) * s) / (cmax - cmin);
+              res.g = 0;
+            }
+          else
+            {
+              res.g = ((c.g - cmin) * s) / (cmax - cmin);
+              res.b = 0;
+            }
+          res.r = s;
+        }
+      else if (c.g == cmax)
+        {
+          if (c.r == cmin)
+            {
+              res.b = ((c.b - cmin) * s) / (cmax - cmin);
+              res.r = 0;
+            }
+          else
+            {
+              res.r = ((c.r - cmin) * s) / (cmax - cmin);
+              res.b = 0;
+            }
+          res.g = s;
+        }
+      else
+        {
+          if (c.r == cmin)
+            {
+              res.g = ((c.g - cmin) * s) / (cmax - cmin);
+              res.r = 0;
+            }
+          else
+            {
+              res.r = ((c.r - cmin) * s) / (cmax - cmin);
+              res.g = 0;
+            }
+          res.b = s;
+        }
+    }
+  return res;
+}
+
+vec4
+color (vec4 Cs, vec4 Cb)
+{
+  vec3 B = set_lum (Cs.rgb, lum (Cb.rgb));
+  return composite (Cs, Cb, B);
+}
+
+vec4
+hue (vec4 Cs, vec4 Cb)
+{
+  vec3 B = set_lum (set_sat (Cs.rgb, sat (Cb.rgb)), lum (Cb.rgb));
+  return composite (Cs, Cb, B);
+}
+
+vec4
+saturation (vec4 Cs, vec4 Cb)
+{
+  vec3 B = set_lum (set_sat (Cb.rgb, sat (Cs.rgb)), lum (Cb.rgb));
+  return composite (Cs, Cb, B);
+}
+
+vec4
+luminosity (vec4 Cs, vec4 Cb)
+{
+  vec3 B = set_lum (Cb.rgb, lum (Cs.rgb));
+  return composite (Cs, Cb, B);
+}
+
+void main() {
+  vec4 bottom_color = Texture(u_source, vUv);
+  vec4 top_color = Texture(u_source2, vUv);
+
+  vec4 result;
+  switch(u_mode) {
+    case 0:  result = normal(bottom_color, top_color);      break;
+    case 1:  result = multiply(bottom_color, top_color);    break;
+    case 2:  result = screen(bottom_color, top_color);      break;
+    case 3:  result = overlay(bottom_color, top_color);     break;
+    case 4:  result = darken(bottom_color, top_color);      break;
+    case 5:  result = lighten(bottom_color, top_color);     break;
+    case 6:  result = color_dodge(bottom_color, top_color); break;
+    case 7:  result = color_burn(bottom_color, top_color);  break;
+    case 8:  result = hard_light(bottom_color, top_color);  break;
+    case 9:  result = soft_light(bottom_color, top_color);  break;
+    case 10: result = difference(bottom_color, top_color);  break;
+    case 11: result = exclusion(bottom_color, top_color);   break;
+    case 12: result = color(bottom_color, top_color);       break;
+    case 13: result = hue(bottom_color, top_color);         break;
+    case 14: result = saturation(bottom_color, top_color);  break;
+    case 15: result = luminosity(bottom_color, top_color);  break;
+    default: discard;
+  }
+
+  setOutputColor(result * u_alpha);
+}
@@ -42,6 +42,13 @@ gtk_cell_accessible_parent_get_type (void)
  return g_define_type_id__volatile;
 }

+/**
+ * gtk_cell_accessible_parent_get_cell_extents:
+ * @x: (out):
+ * @y: (out):
+ * @width: (out):
+ * @height: (out):
+ */
 void
 gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent,
                                             GtkCellAccessible       *cell,
@@ -61,6 +68,10 @@ gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent,
    (iface->get_cell_extents) (parent, cell, x, y, width, height, coord_type);
 }

+/**
+ * gtk_cell_accessible_parent_get_cell_area:
+ * @cell_rect: (out):
+ */
 void
 gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent,
                                          GtkCellAccessible       *cell,
@@ -188,6 +199,11 @@ gtk_cell_accessible_parent_update_relationset (GtkCellAccessibleParent *parent,
    (iface->update_relationset) (parent, cell, relationset);
 }

+/**
+ * gtk_cell_accessible_parent_get_cell_position:
+ * @row: (out):
+ * @column: (out):
+ */
 void
 gtk_cell_accessible_parent_get_cell_position (GtkCellAccessibleParent *parent,
                                              GtkCellAccessible       *cell,
@@ -614,7 +614,6 @@ static gboolean
 gtk_icon_view_item_accessible_grab_focus (AtkComponent *component)
 {
  GtkIconViewItemAccessible *item;
-  GtkWidget *toplevel;

  g_return_val_if_fail (GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE (component), FALSE);

@@ -624,13 +623,6 @@ gtk_icon_view_item_accessible_grab_focus (AtkComponent *component)

  gtk_widget_grab_focus (item->widget);
  _gtk_icon_view_set_cursor_item (GTK_ICON_VIEW (item->widget), item->item, NULL);
-  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->widget));
-  if (gtk_widget_is_toplevel (toplevel))
-    {
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      gtk_window_present (GTK_WINDOW (toplevel));
-      G_GNUC_END_IGNORE_DEPRECATIONS
-    }

  return TRUE;
 }
@@ -432,7 +432,7 @@ add_action_widgets (GtkAssistant *assistant)

          if (has_default)
            {
-              gtk_widget_grab_default (child);
+              gtk_window_set_default_widget (GTK_WINDOW (assistant), child);
              gtk_style_context_add_class (gtk_widget_get_style_context (child), GTK_STYLE_CLASS_SUGGESTED_ACTION);
            }
        }
@@ -807,7 +807,7 @@ update_buttons_state (GtkAssistant *assistant)
    case GTK_ASSISTANT_PAGE_INTRO:
      gtk_widget_set_sensitive (priv->cancel, TRUE);
      gtk_widget_set_sensitive (priv->forward, priv->current_page->complete);
-      gtk_widget_grab_default (priv->forward);
+      gtk_window_set_default_widget (GTK_WINDOW (assistant), priv->forward);
      gtk_widget_show (priv->forward);
      gtk_widget_hide (priv->back);
      gtk_widget_hide (priv->apply);
@@ -818,7 +818,7 @@ update_buttons_state (GtkAssistant *assistant)
      gtk_widget_set_sensitive (priv->cancel, TRUE);
      gtk_widget_set_sensitive (priv->back, TRUE);
      gtk_widget_set_sensitive (priv->apply, priv->current_page->complete);
-      gtk_widget_grab_default (priv->apply);
+      gtk_window_set_default_widget (GTK_WINDOW (assistant), priv->apply);
      gtk_widget_show (priv->back);
      gtk_widget_show (priv->apply);
      gtk_widget_hide (priv->forward);
@@ -829,7 +829,7 @@ update_buttons_state (GtkAssistant *assistant)
      gtk_widget_set_sensitive (priv->cancel, TRUE);
      gtk_widget_set_sensitive (priv->back, TRUE);
      gtk_widget_set_sensitive (priv->forward, priv->current_page->complete);
-      gtk_widget_grab_default (priv->forward);
+      gtk_window_set_default_widget (GTK_WINDOW (assistant), priv->forward);
      gtk_widget_show (priv->back);
      gtk_widget_show (priv->forward);
      gtk_widget_hide (priv->apply);
@@ -838,7 +838,7 @@ update_buttons_state (GtkAssistant *assistant)
      break;
    case GTK_ASSISTANT_PAGE_SUMMARY:
      gtk_widget_set_sensitive (priv->close, priv->current_page->complete);
-      gtk_widget_grab_default (priv->close);
+      gtk_window_set_default_widget (GTK_WINDOW (assistant), priv->close);
      gtk_widget_show (priv->close);
      gtk_widget_hide (priv->back);
      gtk_widget_hide (priv->forward);
@@ -849,7 +849,7 @@ update_buttons_state (GtkAssistant *assistant)
      gtk_widget_set_sensitive (priv->cancel, priv->current_page->complete);
      gtk_widget_set_sensitive (priv->back, priv->current_page->complete);
      gtk_widget_set_sensitive (priv->forward, priv->current_page->complete);
-      gtk_widget_grab_default (priv->forward);
+      gtk_window_set_default_widget (GTK_WINDOW (assistant), priv->forward);
      gtk_widget_show (priv->back);
      gtk_widget_hide (priv->apply);
      gtk_widget_hide (priv->close);
@@ -766,6 +766,14 @@ gtk_box_layout_init (GtkBoxLayout *self)
  self->baseline_position = GTK_BASELINE_POSITION_CENTER;
 }

+/**
+ * gtk_box_layout_new:
+ * @orientation: the orientation for the new layout
+ *
+ * Creates a new box layout.
+ *
+ * Returns: a new box layout
+ */
 GtkLayoutManager *
 gtk_box_layout_new (GtkOrientation orientation)
 {
@@ -774,6 +782,14 @@ gtk_box_layout_new (GtkOrientation orientation)
                       NULL);
 }

+/**
+ * gtk_box_layout_set_homogeneous:
+ * @box_layout: a #GtkBoxLayout
+ * @homogeneous: %TRUE to set the box layout as homogeneous
+ *
+ * Sets whether the box layout will allocate the same
+ * size to all children.
+ */
 void
 gtk_box_layout_set_homogeneous (GtkBoxLayout *box_layout,
                                gboolean      homogeneous)
@@ -790,6 +806,14 @@ gtk_box_layout_set_homogeneous (GtkBoxLayout *box_layout,
  g_object_notify_by_pspec (G_OBJECT (box_layout), box_layout_props[PROP_HOMOGENEOUS]);
 }

+/**
+ * gtk_box_layout_get_homogeneous:
+ * @box_layout: a #GtkBoxLayout
+ *
+ * Returns whether the layout is set to be homogeneous.
+ *
+ * Return: %TRUE if the layout is homogeneous
+ */
 gboolean
 gtk_box_layout_get_homogeneous (GtkBoxLayout *box_layout)
 {
@@ -798,6 +822,13 @@ gtk_box_layout_get_homogeneous (GtkBoxLayout *box_layout)
  return box_layout->homogeneous;
 }

+/**
+ * gtk_box_layout_set_spacing:
+ * @box_layout: a #GtkBoxLayout
+ * @spacing: the spacing to apply between children
+ *
+ * Sets how much spacing to put between children.
+ */
 void
 gtk_box_layout_set_spacing (GtkBoxLayout *box_layout,
                            guint         spacing)
@@ -813,6 +844,14 @@ gtk_box_layout_set_spacing (GtkBoxLayout *box_layout,
  g_object_notify_by_pspec (G_OBJECT (box_layout), box_layout_props[PROP_SPACING]);
 }

+/**
+ * gtk_box_layout_get_spacing:
+ * @box_layout: a #GtkBoxLayout
+ *
+ * Returns the space that @box_layout puts between children.
+ *
+ * Returns: the spacing of the layout
+ */
 guint
 gtk_box_layout_get_spacing (GtkBoxLayout *box_layout)
 {
@@ -1094,7 +1094,7 @@ gtk_builder_add_from_file (GtkBuilder   *builder,
  priv->resource_prefix = NULL;

  _gtk_builder_parser_parse_buffer (builder, filename,
-                                    buffer, length,
+                                    buffer, (gssize)length,
                                    NULL,
                                    &tmp_error);

@@ -1160,7 +1160,7 @@ gtk_builder_add_objects_from_file (GtkBuilder   *builder,
  priv->resource_prefix = NULL;

  _gtk_builder_parser_parse_buffer (builder, filename,
-                                    buffer, length,
+                                    buffer, (gssize)length,
                                    object_ids,
                                    &tmp_error);

@@ -1198,7 +1198,7 @@ gtk_builder_extend_with_template (GtkBuilder   *builder,
                                  GtkWidget    *widget,
                                  GType         template_type,
                                  const gchar  *buffer,
-                                  gsize         length,
+                                  gssize        length,
                                  GError      **error)
 {
  GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
@@ -1394,7 +1394,7 @@ gtk_builder_add_objects_from_resource (GtkBuilder   *builder,
 *
 * Most users will probably want to use gtk_builder_new_from_string().
 *
- * Upon errors 0 will be returned and @error will be assigned a
+ * Upon errors %FALSE will be returned and @error will be assigned a
 * #GError from the #GTK_BUILDER_ERROR, #G_MARKUP_ERROR or
 * #G_VARIANT_PARSE_ERROR domain.
 *
@@ -1407,7 +1407,7 @@ gtk_builder_add_objects_from_resource (GtkBuilder   *builder,
 gboolean
 gtk_builder_add_from_string (GtkBuilder   *builder,
                             const gchar  *buffer,
-                             gsize         length,
+                             gssize        length,
                             GError      **error)
 {
  GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
@@ -1449,7 +1449,7 @@ gtk_builder_add_from_string (GtkBuilder   *builder,
 * building only the requested objects and merges
 * them with the current contents of @builder.
 *
- * Upon errors 0 will be returned and @error will be assigned a
+ * Upon errors %FALSE will be returned and @error will be assigned a
 * #GError from the #GTK_BUILDER_ERROR or #G_MARKUP_ERROR domain.
 *
 * If you are adding an object that depends on an object that is not
@@ -1461,7 +1461,7 @@ gtk_builder_add_from_string (GtkBuilder   *builder,
 gboolean
 gtk_builder_add_objects_from_string (GtkBuilder   *builder,
                                     const gchar  *buffer,
-                                     gsize         length,
+                                     gssize        length,
                                     gchar       **object_ids,
                                     GError      **error)
 {
@@ -128,7 +128,7 @@ gboolean     gtk_builder_add_from_resource       (GtkBuilder    *builder,
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_add_from_string         (GtkBuilder    *builder,
                                                  const gchar   *buffer,
-                                                  gsize          length,
+                                                  gssize         length,
                                                  GError       **error);
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_add_objects_from_file   (GtkBuilder    *builder,
@@ -143,7 +143,7 @@ gboolean     gtk_builder_add_objects_from_resource(GtkBuilder    *builder,
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_builder_add_objects_from_string (GtkBuilder    *builder,
                                                  const gchar   *buffer,
-                                                  gsize          length,
+                                                  gssize         length,
                                                  gchar        **object_ids,
                                                  GError       **error);
 GDK_AVAILABLE_IN_ALL
@@ -228,7 +228,7 @@ gboolean  gtk_builder_extend_with_template  (GtkBuilder    *builder,
                                             GtkWidget     *widget,
                                             GType          template_type,
                                             const gchar   *buffer,
-                                             gsize          length,
+                                             gssize         length,
                                             GError       **error);

 G_END_DECLS
@@ -1230,7 +1230,7 @@ void
 _gtk_builder_parser_parse_buffer (GtkBuilder   *builder,
                                  const gchar  *filename,
                                  const gchar  *buffer,
-                                  gsize         length,
+                                  gssize        length,
                                  gchar       **requested_objs,
                                  GError      **error)
 {
@@ -135,7 +135,7 @@ typedef GType (*GTypeGetFunc) (void);
 void _gtk_builder_parser_parse_buffer (GtkBuilder *builder,
                                       const gchar *filename,
                                       const gchar *buffer,
-                                       gsize length,
+                                       gssize length,
                                       gchar **requested_objs,
                                       GError **error);
 GObject * _gtk_builder_construct (GtkBuilder *builder,
@@ -129,8 +129,6 @@ static void gtk_button_get_property   (GObject            *object,
                                       guint               prop_id,
                                       GValue             *value,
                                       GParamSpec         *pspec);
-static void gtk_button_display_changed (GtkWidget         *widget,
-				        GdkDisplay        *previous_display);
 static void gtk_button_unrealize (GtkWidget * widget);
 static void gtk_real_button_clicked (GtkButton * button);
 static void gtk_real_button_activate  (GtkButton          *button);
@@ -204,7 +202,6 @@ gtk_button_class_init (GtkButtonClass *klass)
  gobject_class->set_property = gtk_button_set_property;
  gobject_class->get_property = gtk_button_get_property;

-  widget_class->display_changed = gtk_button_display_changed;
  widget_class->unrealize = gtk_button_unrealize;
  widget_class->state_flags_changed = gtk_button_state_flags_changed;
  widget_class->grab_notify = gtk_button_grab_notify;
@@ -923,18 +920,6 @@ gtk_button_get_use_underline (GtkButton *button)
  return priv->use_underline;
 }

-static void
-gtk_button_display_changed (GtkWidget  *widget,
-                            GdkDisplay *previous_display)
-{
-  GtkButton *button = GTK_BUTTON (widget);
-  GtkButtonPrivate *priv = gtk_button_get_instance_private (button);
-
-  /* If the button is being pressed while the display changes the
-    release might never occur, so we reset the state. */
-  priv->button_down = FALSE;
-}
-
 static void
 gtk_button_state_flags_changed (GtkWidget     *widget,
                                GtkStateFlags  previous_state)
@@ -153,16 +153,6 @@ gtk_color_button_measure (GtkWidget       *widget,
                      minimum_baseline, natural_baseline);
 }

-static void
-gtk_color_button_snapshot (GtkWidget   *widget,
-                           GtkSnapshot *snapshot)
-{
-  GtkColorButton *button = GTK_COLOR_BUTTON (widget);
-  GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);
-
-  gtk_widget_snapshot_child (widget, priv->button, snapshot);
-}
-
 static void
 gtk_color_button_size_allocate (GtkWidget *widget,
                                int        width,
@@ -193,7 +183,6 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
  gobject_class->set_property = gtk_color_button_set_property;
  gobject_class->finalize = gtk_color_button_finalize;

-  widget_class->snapshot = gtk_color_button_snapshot;
  widget_class->measure = gtk_color_button_measure;
  widget_class->size_allocate = gtk_color_button_size_allocate;
  klass->color_set = NULL;
@@ -156,7 +156,6 @@
 *   </child>
 *   <child type="action">
 *     <object class="GtkButton" id="button_ok">
- *       <property name="can-default">True</property>
 *     </object>
 *   </child>
 *   <action-widgets>
@@ -456,7 +455,7 @@ gtk_dialog_constructed (GObject *object)
          g_object_unref (child);

          if (has_default)
-            gtk_widget_grab_default (child);
+            gtk_window_set_default_widget (GTK_WINDOW (dialog), child);
        }
      g_list_free (children);

@@ -865,7 +864,7 @@ gtk_dialog_add_action_widget (GtkDialog *dialog,

      if (gtk_widget_has_default (child))
        {
-          gtk_widget_grab_default (child);
+          gtk_window_set_default_widget (GTK_WINDOW (dialog), child);
          update_suggested_action (dialog);
        }
    }
@@ -900,8 +899,6 @@ gtk_dialog_add_button (GtkDialog   *dialog,
  button = gtk_button_new_with_label (button_text);
  gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);

-  gtk_widget_set_can_default (button, TRUE);
-
  gtk_widget_show (button);

  gtk_dialog_add_action_widget (dialog, button, response_id);
@@ -1028,7 +1025,7 @@ gtk_dialog_set_default_response (GtkDialog *dialog,
      ResponseData *rd = get_response_data (widget, FALSE);

      if (rd && rd->response_id == response_id)
-	gtk_widget_grab_default (widget);
+        gtk_window_set_default_widget (GTK_WINDOW (dialog), widget);

      tmp_list = tmp_list->next;
    }
@@ -1528,7 +1525,7 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
        }

      if (item->is_default)
-        gtk_widget_grab_default (GTK_WIDGET (object));
+        gtk_window_set_default_widget (GTK_WINDOW (dialog), GTK_WIDGET (object));
    }

  g_slist_free_full (data->items, free_action_widget_info);
@@ -1234,10 +1234,13 @@ notify_cb (GObject    *object,
           gpointer    data)
 {
  gpointer iface;
+  gpointer class;

  /* The editable interface properties are already forwarded by the editable delegate setup */
  iface = g_type_interface_peek (g_type_class_peek (G_OBJECT_TYPE (object)), gtk_editable_get_type ());
-  if (!g_object_interface_find_property (iface, pspec->name))
+  class = g_type_class_peek (GTK_TYPE_ENTRY);
+  if (!g_object_interface_find_property (iface, pspec->name) &&
+      g_object_class_find_property (class, pspec->name))
    g_object_notify (data, pspec->name);
 }

@@ -1547,6 +1550,7 @@ gtk_entry_size_allocate (GtkWidget *widget,
                         int        height,
                         int        baseline)
 {
+  const gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
  GtkEntry *entry = GTK_ENTRY (widget);
  GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
  gint i;
@@ -1572,8 +1576,8 @@ gtk_entry_size_allocate (GtkWidget *widget,
                          NULL, &icon_width,
                          NULL, NULL);

-      if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL && i == GTK_ENTRY_ICON_PRIMARY) ||
-          (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR && i == GTK_ENTRY_ICON_SECONDARY))
+      if ((is_rtl  && i == GTK_ENTRY_ICON_PRIMARY) ||
+          (!is_rtl && i == GTK_ENTRY_ICON_SECONDARY))
        icon_alloc.x = width - icon_width;
      else
        icon_alloc.x = 0;
@@ -1584,7 +1588,9 @@ gtk_entry_size_allocate (GtkWidget *widget,
      gtk_widget_size_allocate (icon_info->widget, &icon_alloc, baseline);

      text_alloc.width -= icon_width;
-      if (i == 0)
+
+      if ((!is_rtl  && i == GTK_ENTRY_ICON_PRIMARY) ||
+          (is_rtl && i == GTK_ENTRY_ICON_SECONDARY))
        text_alloc.x += icon_width;
    }

@@ -2117,10 +2123,6 @@ gtk_entry_get_text_length (GtkEntry *entry)
 * widget for the window containing the entry. This usually means that
 * the dialog box containing the entry will be closed, since the default
 * widget is usually one of the dialog buttons.
- *
- * (For experts: if @setting is %TRUE, the entry calls
- * gtk_window_activate_default() on the window containing the entry, in
- * the default handler for the #GtkEntry::activate signal.)
 **/
 void
 gtk_entry_set_activates_default (GtkEntry *entry,
@@ -82,8 +82,7 @@ struct _GtkEntry
 *   non-%NULL, this will be called to add additional entries to the context
 *   menu when it is displayed.
 * @activate: Class handler for the #GtkEntry::activate signal. The default
- *   implementation calls gtk_window_activate_default() on the entry’s top-level
- *   window.
+ *   implementation activates the gtk.activate-default action.
 * @move_cursor: Class handler for the #GtkEntry::move-cursor signal. The
 *   default implementation specifies the standard #GtkEntry cursor movement
 *   behavior.
@@ -43,6 +43,7 @@ typedef struct _GtkEventControllerPrivate GtkEventControllerPrivate;
 enum {
  PROP_WIDGET = 1,
  PROP_PROPAGATION_PHASE,
+  PROP_RESPONSIVE,
  LAST_PROP
 };

@@ -52,6 +53,7 @@ struct _GtkEventControllerPrivate
 {
  GtkWidget *widget;
  GtkPropagationPhase phase;
+  gboolean responsive;
 };

 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GtkEventController, gtk_event_controller, G_TYPE_OBJECT)
@@ -63,6 +65,7 @@ gtk_event_controller_set_widget (GtkEventController *self,
  GtkEventControllerPrivate *priv = gtk_event_controller_get_instance_private (self);

  priv->widget = widget;
+  priv->responsive = gtk_widget_get_sensitive (widget);
 }

 static void
@@ -71,6 +74,16 @@ gtk_event_controller_unset_widget (GtkEventController *self)
  GtkEventControllerPrivate *priv = gtk_event_controller_get_instance_private (self);

  priv->widget = NULL;
+  priv->responsive = TRUE;
+}
+
+static gboolean
+gtk_event_controller_filter_event_default (GtkEventController *self,
+                                           const GdkEvent     *event)
+{
+  GtkEventControllerPrivate *priv = gtk_event_controller_get_instance_private (self);
+
+  return !priv->responsive;
 }

 static gboolean
@@ -116,6 +129,9 @@ gtk_event_controller_get_property (GObject    *object,
    case PROP_PROPAGATION_PHASE:
      g_value_set_enum (value, priv->phase);
      break;
+    case PROP_RESPONSIVE:
+      g_value_set_enum (value, priv->responsive);
+      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    }
@@ -128,7 +144,7 @@ gtk_event_controller_class_init (GtkEventControllerClass *klass)

  klass->set_widget = gtk_event_controller_set_widget;
  klass->unset_widget = gtk_event_controller_unset_widget;
-  klass->filter_event = gtk_event_controller_handle_event_default;
+  klass->filter_event = gtk_event_controller_filter_event_default;
  klass->handle_event = gtk_event_controller_handle_event_default;

  object_class->set_property = gtk_event_controller_set_property;
@@ -158,6 +174,21 @@ gtk_event_controller_class_init (GtkEventControllerClass *klass)
                         GTK_PHASE_BUBBLE,
                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);

+  /**
+   * GtkEventController:responsive:
+   *
+   * Whether the controller handles events.
+   *
+   * GTK sets event controllers to be not responsive
+   * when the widget they are attached to becomes insensitive.
+   */
+  properties[PROP_RESPONSIVE] =
+      g_param_spec_boolean ("responsive",
+                            P_("Responsive"),
+                            P_("Whether the controller is reponsive"),
+                            TRUE,
+                            GTK_PARAM_READABLE);
+
  g_object_class_install_properties (object_class, LAST_PROP, properties);
 }

@@ -168,6 +199,7 @@ gtk_event_controller_init (GtkEventController *controller)

  priv = gtk_event_controller_get_instance_private (controller);
  priv->phase = GTK_PHASE_BUBBLE;
+  priv->responsive = TRUE;
 }

 /**
@@ -299,3 +331,44 @@ gtk_event_controller_set_propagation_phase (GtkEventController  *controller,

  g_object_notify_by_pspec (G_OBJECT (controller), properties[PROP_PROPAGATION_PHASE]);
 }
+
+void
+gtk_event_controller_set_responsive (GtkEventController *controller,
+                                     gboolean            responsive)
+{
+  GtkEventControllerPrivate *priv;
+
+  g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
+
+  priv = gtk_event_controller_get_instance_private (controller);
+
+  if (priv->responsive == responsive)
+    return;
+
+  priv->responsive = responsive;
+
+  if (!responsive)
+    gtk_event_controller_reset (controller);
+
+  g_object_notify_by_pspec (G_OBJECT (controller), properties[PROP_RESPONSIVE]);
+}
+
+/**
+ * gtk_event_controller_get_responsive:
+ * @controller: a #GtkEventController
+ *
+ * Returns whether the controller is currently responsive.
+ *
+ * Returns: %TRUE if @controller is responsive
+ */
+gboolean
+gtk_event_controller_get_responsive (GtkEventController *controller)
+{
+  GtkEventControllerPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_EVENT_CONTROLLER (controller), TRUE);
+
+  priv = gtk_event_controller_get_instance_private (controller);
+
+  return priv->responsive;
+}
@@ -59,6 +59,9 @@ GDK_AVAILABLE_IN_ALL
 void                gtk_event_controller_set_propagation_phase (GtkEventController  *controller,
                                                                GtkPropagationPhase  phase);

+GDK_AVAILABLE_IN_ALL
+gboolean            gtk_event_controller_get_responsive (GtkEventController *controller);
+
 G_END_DECLS

 #endif /* __GTK_EVENT_CONTROLLER_H__ */
@@ -48,4 +48,8 @@ struct _GtkEventControllerClass
  gpointer padding[10];
 };

+void
+gtk_event_controller_set_responsive (GtkEventController *controller,
+                                     gboolean            responsive);
+
 #endif /* __GTK_EVENT_CONTROLLER_PRIVATE_H__ */
@@ -256,12 +256,11 @@ static void     gtk_file_chooser_button_drag_data_received (GtkWidget        *wi
 							    GtkSelectionData *data);
 static void     gtk_file_chooser_button_show               (GtkWidget        *widget);
 static void     gtk_file_chooser_button_hide               (GtkWidget        *widget);
+static void     gtk_file_chooser_button_root               (GtkWidget *widget);
 static void     gtk_file_chooser_button_map                (GtkWidget        *widget);
 static gboolean gtk_file_chooser_button_mnemonic_activate  (GtkWidget        *widget,
 							    gboolean          group_cycling);
 static void     gtk_file_chooser_button_style_updated      (GtkWidget        *widget);
-static void     gtk_file_chooser_button_display_changed    (GtkWidget        *widget,
-							    GdkDisplay       *old_display);
 static void     gtk_file_chooser_button_state_flags_changed (GtkWidget       *widget,
                                                             GtkStateFlags    previous_state);

@@ -395,7 +394,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
  widget_class->hide = gtk_file_chooser_button_hide;
  widget_class->map = gtk_file_chooser_button_map;
  widget_class->style_updated = gtk_file_chooser_button_style_updated;
-  widget_class->display_changed = gtk_file_chooser_button_display_changed;
+  widget_class->root = gtk_file_chooser_button_root;
  widget_class->mnemonic_activate = gtk_file_chooser_button_mnemonic_activate;
  widget_class->state_flags_changed = gtk_file_chooser_button_state_flags_changed;
  widget_class->measure = gtk_file_chooser_button_measure;
@@ -1494,16 +1493,13 @@ gtk_file_chooser_button_style_updated (GtkWidget *widget)
 }

 static void
-gtk_file_chooser_button_display_changed (GtkWidget  *widget,
-					 GdkDisplay *old_display)
+gtk_file_chooser_button_root (GtkWidget *widget)
 {
-  if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->display_changed)
-    GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->display_changed (widget, old_display);
+  GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->root (widget);

  change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
 }

-
 /* ******************* *
 *  Utility Functions  *
 * ******************* */
@@ -341,17 +341,7 @@ static void
 file_chooser_widget_file_activated (GtkFileChooser       *chooser,
                                    GtkFileChooserDialog *dialog)
 {
-  GtkWidget *widget;
-
-  if (gtk_window_activate_default (GTK_WINDOW (dialog)))
-    return;
-
-  /* There probably isn't a default widget, so make things easier for the
-   * programmer by looking for a reasonable button on our own.
-   */
-  widget = get_accept_action_widget (GTK_DIALOG (dialog), TRUE);
-  if (widget)
-    gtk_widget_activate (widget);
+  gtk_widget_activate_default (GTK_WIDGET (chooser));
 }

 static void
@@ -409,12 +399,6 @@ file_chooser_widget_response_requested (GtkWidget            *widget,

  dialog->priv->response_requested = TRUE;

-  if (gtk_window_activate_default (GTK_WINDOW (dialog)))
-    return;
-
-  /* There probably isn't a default widget, so make things easier for the
-   * programmer by looking for a reasonable button on our own.
-   */
  button = get_accept_action_widget (GTK_DIALOG (dialog), TRUE);
  if (button)
    {
@@ -563,7 +547,7 @@ ensure_default_response (GtkFileChooserDialog *dialog)

  widget = get_accept_action_widget (GTK_DIALOG (dialog), TRUE);
  if (widget)
-    gtk_widget_grab_default (widget);
+    gtk_window_set_default_widget (GTK_WINDOW (dialog), widget);
 }

 static void
@@ -83,6 +83,7 @@
 #include "gtkfilechoosererrorstackprivate.h"
 #include "gtkentryprivate.h"
 #include "gtkroot.h"
+#include "gtkbinlayout.h"

 #include <cairo-gobject.h>

@@ -347,6 +348,8 @@ struct _GtkFileChooserWidgetPrivate {
  gint sort_column;
  GtkSortType sort_order;

+  ClockFormat clock_format;
+
  /* Flags */

  guint local_only : 1;
@@ -363,6 +366,7 @@ struct _GtkFileChooserWidgetPrivate {
  guint show_size_column : 1;
  guint create_folders : 1;
  guint auto_selecting_first_row : 1;
+  guint starting_search : 1;
 };

 #define MAX_LOADING_TIME 500
@@ -457,8 +461,6 @@ static void     gtk_file_chooser_widget_unmap          (GtkWidget             *w
 static void     gtk_file_chooser_widget_root           (GtkWidget             *widget);
 static void     gtk_file_chooser_widget_unroot         (GtkWidget             *widget);
 static void     gtk_file_chooser_widget_style_updated   (GtkWidget             *widget);
-static void     gtk_file_chooser_widget_display_changed (GtkWidget            *widget,
-                                                         GdkDisplay           *previous_display);

 static gboolean       gtk_file_chooser_widget_set_current_folder           (GtkFileChooser    *chooser,
                                                                            GFile             *folder,
@@ -532,6 +534,7 @@ static void search_shortcut_handler (GtkFileChooserWidget *impl);
 static void recent_shortcut_handler (GtkFileChooserWidget *impl);
 static void places_shortcut_handler (GtkFileChooserWidget *impl);
 static void update_appearance       (GtkFileChooserWidget *impl);
+static void check_icon_theme (GtkFileChooserWidget *impl);

 static void operation_mode_set (GtkFileChooserWidget *impl, OperationMode mode);
 static void location_mode_set  (GtkFileChooserWidget *impl, LocationMode new_mode);
@@ -555,8 +558,6 @@ static void list_row_activated         (GtkTreeView           *tree_view,
                                        GtkTreePath           *path,
                                        GtkTreeViewColumn     *column,
                                        GtkFileChooserWidget  *impl);
-static void list_cursor_changed        (GtkTreeView           *treeview,
-                                        GtkFileChooserWidget  *impl);

 static void path_bar_clicked (GtkPathBar            *path_bar,
                              GFile                 *file,
@@ -672,8 +673,7 @@ gtk_file_chooser_widget_finalize (GObject *object)
  GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (object);
  GtkFileChooserWidgetPrivate *priv = impl->priv;

-  if (priv->choices)
-    g_hash_table_unref (priv->choices);
+  g_clear_pointer (&priv->choices, g_hash_table_unref);

  if (priv->location_changed_id > 0)
    g_source_remove (priv->location_changed_id);
@@ -683,21 +683,10 @@ gtk_file_chooser_widget_finalize (GObject *object)
  g_free (priv->browse_files_last_selected_name);

  g_slist_free_full (priv->filters, g_object_unref);
-
-  if (priv->current_filter)
-    g_object_unref (priv->current_filter);
-
-  if (priv->current_volume_file)
-    g_object_unref (priv->current_volume_file);
-
-  if (priv->current_folder)
-    g_object_unref (priv->current_folder);
-
-  if (priv->preview_file)
-    g_object_unref (priv->preview_file);
-
-  if (priv->browse_path_bar_size_group)
-    g_object_unref (priv->browse_path_bar_size_group);
+  g_clear_object (&priv->current_filter);
+  g_clear_object (&priv->current_volume_file);
+  g_clear_object (&priv->current_folder);
+  g_clear_object (&priv->browse_path_bar_size_group);

  /* Free all the Models we have */
  stop_loading_and_clear_list_model (impl, FALSE);
@@ -715,31 +704,6 @@ gtk_file_chooser_widget_finalize (GObject *object)
  G_OBJECT_CLASS (gtk_file_chooser_widget_parent_class)->finalize (object);
 }

-/* Shows an error dialog set as transient for the specified window */
-static void
-error_message_with_parent (GtkWindow  *parent,
-                           const char *msg,
-                           const char *detail)
-{
-  GtkWidget *dialog;
-
-  dialog = gtk_message_dialog_new (parent,
-                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
-                                   "%s",
-                                   msg);
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            "%s", detail);
-
-  if (parent && gtk_window_has_group (parent))
-    gtk_window_group_add_window (gtk_window_get_group (parent),
-                                 GTK_WINDOW (dialog));
-
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
-}
-
 /* Returns a toplevel GtkWindow, or NULL if none */
 static GtkWindow *
 get_toplevel (GtkWidget *widget)
@@ -759,7 +723,25 @@ error_message (GtkFileChooserWidget *impl,
               const char            *msg,
               const char            *detail)
 {
-  error_message_with_parent (get_toplevel (GTK_WIDGET (impl)), msg, detail);
+  GtkWindow *parent = get_toplevel (GTK_WIDGET (impl));
+  GtkWidget *dialog;
+
+  dialog = gtk_message_dialog_new (parent,
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_ERROR,
+                                   GTK_BUTTONS_OK,
+                                   "%s",
+                                   msg);
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                            "%s", detail);
+
+  if (parent && gtk_window_has_group (parent))
+    gtk_window_group_add_window (gtk_window_get_group (parent),
+                                 GTK_WINDOW (dialog));
+
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
+
 }

 /* Shows a simple error dialog relative to a path.  Frees the GError as well. */
@@ -920,7 +902,6 @@ update_preview_widget_visibility (GtkFileChooserWidget *impl)
          priv->preview_label = gtk_label_new (priv->preview_display_name);
          gtk_box_insert_child_after (GTK_BOX (priv->preview_box), priv->preview_label, NULL);
          gtk_label_set_ellipsize (GTK_LABEL (priv->preview_label), PANGO_ELLIPSIZE_MIDDLE);
-          gtk_widget_show (priv->preview_label);
        }
    }
  else
@@ -1259,13 +1240,10 @@ places_sidebar_show_error_message_cb (GtkPlacesSidebar *sidebar,
 }

 static gboolean
-key_is_left_or_right (const GdkEvent *event)
+key_is_left_or_right (guint keyval,
+                      guint state)
 {
-  guint modifiers, keyval, state;
-
-  if (!gdk_event_get_keyval (event, &keyval) ||
-      !gdk_event_get_state (event, &state))
-    return FALSE;
+  guint modifiers;

  modifiers = gtk_accelerator_get_default_mod_mask ();

@@ -1326,11 +1304,8 @@ key_press_cb (GtkEventControllerKey *controller,
 {
  GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
  GtkFileChooserWidgetPrivate *priv = impl->priv;
-  const GdkEvent *event;
  const char *string;

-  event = gtk_get_current_event ();
-
  if (should_trigger_location_entry (impl, keyval, state, &string) &&
      (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
       priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER))
@@ -1339,7 +1314,7 @@ key_press_cb (GtkEventControllerKey *controller,
      return GDK_EVENT_STOP;
    }

-  if (key_is_left_or_right (event))
+  if (key_is_left_or_right (keyval, state))
    {
      if (gtk_widget_child_focus (priv->places_sidebar, GTK_DIR_LEFT))
        return GDK_EVENT_STOP;
@@ -1354,25 +1329,8 @@ key_press_cb (GtkEventControllerKey *controller,
      && !(priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
           priv->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
    {
-      GtkWidget *widget = GTK_WIDGET (impl);
-      GtkWindow *window;
-
-      window = get_toplevel (widget);
-      if (window)
-        {
-          GtkWidget *default_widget, *focus_widget;
-
-          default_widget = gtk_window_get_default_widget (window);
-          focus_widget = gtk_root_get_focus (GTK_ROOT (window));
-
-          if (widget != default_widget &&
-              !(widget == focus_widget && (!default_widget || !gtk_widget_get_sensitive (default_widget))))
-            {
-              gtk_window_activate_default (window);
-
-              return GDK_EVENT_STOP;
-            }
-        }
+      gtk_widget_activate_default (GTK_WIDGET (impl));
+      return GDK_EVENT_STOP;
    }

  if (keyval == GDK_KEY_Escape &&
@@ -1395,11 +1353,8 @@ widget_key_press_cb (GtkEventControllerKey *controller,
  GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
  GtkFileChooserWidgetPrivate *priv = impl->priv;
  gboolean handled = FALSE;
-  GdkEvent *event;
  const char *string;

-  event = gtk_get_current_event ();
-
  if (should_trigger_location_entry (impl, keyval, state, &string))
    {
      if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
@@ -1411,16 +1366,17 @@ widget_key_press_cb (GtkEventControllerKey *controller,
    }
  else
    {
-      gtk_event_controller_key_forward (controller, priv->search_entry);
+      priv->starting_search = TRUE;
+      if (gtk_event_controller_key_forward (controller, priv->search_entry))
+        {
+          if (priv->operation_mode != OPERATION_MODE_SEARCH &&
+              priv->starting_search)
+            operation_mode_set (impl, OPERATION_MODE_SEARCH);

-      if (priv->operation_mode != OPERATION_MODE_SEARCH)
-        operation_mode_set (impl, OPERATION_MODE_SEARCH);
-
-      handled = TRUE;
+          handled = TRUE;
+        }
    }

-  g_object_unref (event);
-
  return handled;
 }

@@ -1709,7 +1665,6 @@ visit_file_cb (GSimpleAction *action,
  g_slist_free_full (files, g_object_unref);
 }

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 /* Callback used when the "Open this folder" menu item is activated */
 static void
 open_folder_cb (GSimpleAction *action,
@@ -1735,7 +1690,6 @@ open_folder_cb (GSimpleAction *action,

  g_slist_free_full (files, g_object_unref);
 }
-G_GNUC_END_IGNORE_DEPRECATIONS

 /* callback used when the "Show Hidden Files" menu item is toggled */
 static void
@@ -2197,7 +2151,6 @@ file_list_build_popover (GtkFileChooserWidget *impl)
  priv->browse_files_popover = gtk_popover_new (priv->browse_files_tree_view);
  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
  g_object_set (box, "margin", 10, NULL);
-  gtk_widget_show (box);
  gtk_container_add (GTK_CONTAINER (priv->browse_files_popover), box);

  priv->visit_file_item = add_button (box, _("_Visit File"), "item.visit");
@@ -2267,7 +2220,12 @@ file_list_show_popover (GtkFileChooserWidget *impl,
  GtkTreeModel *model;
  GList *list;
  GtkTreePath *path;
+  graphene_rect_t bounds;

+  if (!gtk_widget_compute_bounds (priv->browse_files_tree_view,
+                                  priv->browse_files_tree_view,
+                                  &bounds))
+    return;

  file_list_update_popover (impl);

@@ -2280,7 +2238,7 @@ file_list_show_popover (GtkFileChooserWidget *impl,
      gtk_tree_view_convert_bin_window_to_widget_coords (GTK_TREE_VIEW (priv->browse_files_tree_view),
                                                     rect.x, rect.y, &rect.x, &rect.y);

-      rect.x = CLAMP (x - 20, 0, gtk_widget_get_allocated_width (priv->browse_files_tree_view) - 40);
+      rect.x = CLAMP (x - 20, 0, bounds.size.width - 40);
      rect.width = 40;

      g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
@@ -2303,11 +2261,17 @@ list_popup_menu_cb (GtkWidget            *widget,
                    GtkFileChooserWidget *impl)
 {
  GtkFileChooserWidgetPrivate *priv = impl->priv;
+  graphene_rect_t bounds;

-  file_list_show_popover (impl,
-                          0.5 * gtk_widget_get_allocated_width (GTK_WIDGET (priv->browse_files_tree_view)),
-                          0.5 * gtk_widget_get_allocated_height (GTK_WIDGET (priv->browse_files_tree_view)));
-  return TRUE;
+  if (gtk_widget_compute_bounds (priv->browse_files_tree_view,
+                                 priv->browse_files_tree_view,
+                                 &bounds))
+    {
+      file_list_show_popover (impl, 0.5 * bounds.size.width, 0.5 * bounds.size.height);
+      return TRUE;
+    }
+
+  return FALSE;
 }

 /* Callback used when a button is pressed on the file list.  We trap button 3 to
@@ -2491,6 +2455,7 @@ static void
 location_entry_close_clicked (GtkFileChooserWidget *impl)
 {
  location_mode_set (impl, LOCATION_MODE_PATH_BAR);
+  gtk_widget_grab_focus (GTK_WIDGET (impl));
 }

 static void
@@ -2608,7 +2573,6 @@ save_widgets_create (GtkFileChooserWidget *impl)

  priv->save_widgets = vbox;
  gtk_box_insert_child_after (GTK_BOX (priv->box), priv->save_widgets, NULL);
-  gtk_widget_show (priv->save_widgets);
 }

 /* Destroys the widgets specific to Save mode */
@@ -3468,29 +3432,10 @@ cancel_all_operations (GtkFileChooserWidget *impl)

  pending_select_files_free (impl);

-  if (priv->file_list_drag_data_received_cancellable)
-    {
-      g_cancellable_cancel (priv->file_list_drag_data_received_cancellable);
-      priv->file_list_drag_data_received_cancellable = NULL;
-    }
-
-  if (priv->update_current_folder_cancellable)
-    {
-      g_cancellable_cancel (priv->update_current_folder_cancellable);
-      priv->update_current_folder_cancellable = NULL;
-    }
-
-  if (priv->should_respond_get_info_cancellable)
-    {
-      g_cancellable_cancel (priv->should_respond_get_info_cancellable);
-      priv->should_respond_get_info_cancellable = NULL;
-    }
-
-  if (priv->file_exists_get_info_cancellable)
-    {
-      g_cancellable_cancel (priv->file_exists_get_info_cancellable);
-      priv->file_exists_get_info_cancellable = NULL;
-    }
+  g_clear_pointer (&priv->file_list_drag_data_received_cancellable, g_cancellable_cancel);
+  g_clear_pointer (&priv->update_current_folder_cancellable, g_cancellable_cancel);
+  g_clear_pointer (&priv->should_respond_get_info_cancellable, g_cancellable_cancel);
+  g_clear_pointer (&priv->file_exists_get_info_cancellable, g_cancellable_cancel);

  search_stop_searching (impl, TRUE);
  recent_stop_loading (impl);
@@ -3525,25 +3470,10 @@ gtk_file_chooser_widget_dispose (GObject *object)
  if (priv->rename_file_popover)
    gtk_popover_set_relative_to (GTK_POPOVER (priv->rename_file_popover), NULL);

-  if (priv->browse_files_popover)
-    {
-      gtk_widget_destroy (priv->browse_files_popover);
-      priv->browse_files_popover = NULL;
-    }
-
-  if (priv->extra_widget)
-    {
-      g_object_unref (priv->extra_widget);
-      priv->extra_widget = NULL;
-    }
-
+  g_clear_pointer (&priv->browse_files_popover, gtk_widget_destroy);
+  g_clear_object (&priv->extra_widget);
  remove_settings_signal (impl, gtk_widget_get_display (GTK_WIDGET (impl)));
-
-  if (priv->bookmarks_manager)
-    {
-      _gtk_bookmarks_manager_free (priv->bookmarks_manager);
-      priv->bookmarks_manager = NULL;
-    }
+  g_clear_pointer (&priv->bookmarks_manager, _gtk_bookmarks_manager_free);

  if (priv->external_entry && priv->location_entry == priv->external_entry)
    {
@@ -3551,11 +3481,7 @@ gtk_file_chooser_widget_dispose (GObject *object)
      priv->external_entry = NULL;
    }

-  if (priv->box)
-    {
-      gtk_widget_unparent (priv->box);
-      priv->box = NULL;
-    }
+  g_clear_pointer (&priv->box, gtk_widget_unparent);

  G_OBJECT_CLASS (gtk_file_chooser_widget_parent_class)->dispose (object);
 }
@@ -3611,6 +3537,10 @@ gtk_file_chooser_widget_unroot (GtkWidget *widget)
      priv->toplevel_current_focus_widget = NULL;
    }

+  remove_settings_signal (impl, gtk_widget_get_display (widget));
+  check_icon_theme (impl);
+  emit_default_size_changed (impl);
+
  GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->unroot (widget);
 }

@@ -3695,27 +3625,6 @@ gtk_file_chooser_widget_style_updated (GtkWidget *widget)
  profile_end ("end", NULL);
 }

-static void
-gtk_file_chooser_widget_display_changed (GtkWidget  *widget,
-                                         GdkDisplay *previous_display)
-{
-  GtkFileChooserWidget *impl;
-
-  profile_start ("start", NULL);
-
-  impl = GTK_FILE_CHOOSER_WIDGET (widget);
-
-  if (GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->display_changed)
-    GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->display_changed (widget, previous_display);
-
-  remove_settings_signal (impl, previous_display);
-  check_icon_theme (impl);
-
-  emit_default_size_changed (impl);
-
-  profile_end ("end", NULL);
-}
-
 static void
 set_sort_column (GtkFileChooserWidget *impl)
 {
@@ -3768,6 +3677,7 @@ settings_load (GtkFileChooserWidget *impl)
  priv->startup_mode = startup_mode;
  priv->sort_directories_first = sort_directories_first;
  priv->show_time = date_format == DATE_FORMAT_WITH_TIME;
+  priv->clock_format = g_settings_get_enum (settings, "clock-format");

  /* We don't call set_sort_column() here as the models may not have been
   * created yet.  The individual functions that create and set the models will
@@ -3775,6 +3685,14 @@ settings_load (GtkFileChooserWidget *impl)
   */

  update_time_renderer_visible (impl);
+  if (sidebar_width < 0)
+    {
+      GtkWidget *sidebar = gtk_paned_get_child1 (GTK_PANED (priv->browse_widgets_hpaned));
+
+      gtk_widget_measure (sidebar, GTK_ORIENTATION_HORIZONTAL, -1,
+                          NULL, &sidebar_width, NULL, NULL);
+    }
+
  gtk_paned_set_position (GTK_PANED (priv->browse_widgets_hpaned), sidebar_width);
 }

@@ -4636,13 +4554,11 @@ static char *
 my_g_format_date_for_display (GtkFileChooserWidget *impl,
                              glong                 secs)
 {
-  GtkFileChooserWidgetPrivate *priv = impl->priv;
+  GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
  GDateTime *now, *time;
  GDateTime *now_date, *date;
-  ClockFormat clock_format;
  const gchar *format;
  gchar *date_str;
-  GSettings *settings;
  gint days_ago;

  time = g_date_time_new_from_unix_local (secs);
@@ -4651,9 +4567,6 @@ my_g_format_date_for_display (GtkFileChooserWidget *impl,
                                g_date_time_get_day_of_month (time),
                                0, 0, 0);

-  settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (impl));
-  clock_format = g_settings_get_enum (settings, "clock-format");
-
  now = g_date_time_new_now_local ();
  now_date = g_date_time_new_local (g_date_time_get_year (now),
                                    g_date_time_get_month (now),
@@ -4665,7 +4578,7 @@ my_g_format_date_for_display (GtkFileChooserWidget *impl,
    {
      if (priv->show_time)
        format = "";
-      else if (clock_format == CLOCK_FORMAT_24)
+      else if (priv->clock_format == CLOCK_FORMAT_24)
        /* Translators: see g_date_time_format() for details on the format */
        format = _("%H:%M");
      else
@@ -4703,18 +4616,14 @@ static char *
 my_g_format_time_for_display (GtkFileChooserWidget *impl,
                              glong                 secs)
 {
+  GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
  GDateTime *time;
-  ClockFormat clock_format;
  const gchar *format;
  gchar *date_str;
-  GSettings *settings;

  time = g_date_time_new_from_unix_local (secs);

-  settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (impl));
-  clock_format = g_settings_get_enum (settings, "clock-format");
-
-  if (clock_format == CLOCK_FORMAT_24)
+  if (priv->clock_format == CLOCK_FORMAT_24)
    format = _("%H:%M");
  else
    format = _("%l:%M %p");
@@ -6200,7 +6109,6 @@ add_custom_button_to_dialog (GtkDialog   *dialog,
  GtkWidget *button;

  button = gtk_button_new_with_mnemonic (mnemonic_label);
-  gtk_widget_set_can_default (button, TRUE);

  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
 }
@@ -7001,10 +6909,6 @@ search_engine_hits_added_cb (GtkSearchEngine      *engine,
 {
  GList *l, *files, *files_with_info, *infos;
  GFile *file;
-  gboolean select = FALSE;
-
-  if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (impl->priv->search_model), NULL) == 0)
-    select = TRUE;

  files = NULL;
  files_with_info = NULL;
@@ -7032,8 +6936,6 @@ search_engine_hits_added_cb (GtkSearchEngine      *engine,
  g_list_free_full (infos, g_object_unref);

  gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list");
-  if (select)
-    gtk_widget_grab_focus (impl->priv->browse_files_tree_view);
 }

 /* Callback used from GtkSearchEngine when the query is done running */
@@ -7182,8 +7084,6 @@ search_start_query (GtkFileChooserWidget *impl,
  set_busy_cursor (impl, TRUE);
  priv->show_progress_timeout = g_timeout_add (1500, show_spinner, impl);

-  gtk_stack_set_visible_child_name (GTK_STACK (priv->browse_files_stack), "list");
-
  if (priv->search_engine == NULL)
    priv->search_engine = _gtk_search_engine_new ();

@@ -7217,6 +7117,10 @@ search_start_query (GtkFileChooserWidget *impl,
  if (gtk_query_get_location (priv->search_query) &&
      _gtk_file_consider_as_remote (gtk_query_get_location (priv->search_query)))
    gtk_widget_show (priv->remote_warning_bar);
+
+  /* We're not showing the file list here already and instead rely on the
+   * GtkSearchEntry timout and the ::hits-added signal from above to
+   * switch. */
 }

 /* Callback used when the user presses Enter while typing on the search
@@ -7251,6 +7155,8 @@ search_entry_stop_cb (GtkFileChooserWidget *impl)
    search_stop_searching (impl, FALSE);
  else
    g_object_set (impl, "search-mode", FALSE, NULL);
+
+  impl->priv->starting_search = FALSE;
 }

 /* Hides the path bar and creates the search entry */
@@ -7691,6 +7597,24 @@ list_cursor_changed (GtkTreeView          *list,
  check_preview_change (impl);
 }

+static gboolean
+browse_files_tree_view_keynav_failed_cb (GtkWidget        *widget,
+                                         GtkDirectionType  direction,
+                                         gpointer          user_data)
+{
+ GtkFileChooserWidget *self = user_data;
+ GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (self);
+
+ if (direction == GTK_DIR_UP && priv->operation_mode == OPERATION_MODE_SEARCH)
+   {
+     gtk_widget_grab_focus (priv->search_entry);
+
+     return TRUE;
+   }
+
+  return FALSE;
+}
+
 /* Callback used when a row in the file list is activated */
 static void
 list_row_activated (GtkTreeView          *tree_view,
@@ -7954,39 +7878,6 @@ add_normal_and_shifted_binding (GtkBindingSet   *binding_set,
                                signal_name, 0);
 }

-static void
-gtk_file_chooser_widget_measure (GtkWidget       *widget,
-                                 GtkOrientation  orientation,
-                                 int             for_size,
-                                 int            *minimum,
-                                 int            *natural,
-                                 int            *minimum_baseline,
-                                 int            *natural_baseline)
-{
-  GtkFileChooserWidget *self = GTK_FILE_CHOOSER_WIDGET (widget);
-  GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (self);
-
-  gtk_widget_measure (priv->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-gtk_file_chooser_widget_size_allocate (GtkWidget *widget,
-                                       int        width,
-                                       int        height,
-                                       int        baseline)
-{
-  GtkFileChooserWidget *self = GTK_FILE_CHOOSER_WIDGET (widget);
-  GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (self);
-
-  gtk_widget_size_allocate (priv->box,
-                            &(GtkAllocation) {
-                              0, 0,
-                              width, height
-                            },-1);
-}
-
 static void
 gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
 {
@@ -8010,9 +7901,6 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
  widget_class->root = gtk_file_chooser_widget_root;
  widget_class->unroot = gtk_file_chooser_widget_unroot;
  widget_class->style_updated = gtk_file_chooser_widget_style_updated;
-  widget_class->display_changed = gtk_file_chooser_widget_display_changed;
-  widget_class->measure = gtk_file_chooser_widget_measure;
-  widget_class->size_allocate = gtk_file_chooser_widget_size_allocate;

  /*
   * Signals
@@ -8418,6 +8306,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
  gtk_widget_class_bind_template_callback (widget_class, file_list_drag_end_cb);
  gtk_widget_class_bind_template_callback (widget_class, list_selection_changed);
  gtk_widget_class_bind_template_callback (widget_class, list_cursor_changed);
+  gtk_widget_class_bind_template_callback (widget_class, browse_files_tree_view_keynav_failed_cb);
  gtk_widget_class_bind_template_callback (widget_class, filter_combo_changed);
  gtk_widget_class_bind_template_callback (widget_class, path_bar_clicked);
  gtk_widget_class_bind_template_callback (widget_class, places_sidebar_open_location_cb);
@@ -8578,6 +8467,8 @@ gtk_file_chooser_widget_init (GtkFileChooserWidget *impl)
   */
  post_process_ui (impl);

+  gtk_widget_set_layout_manager (GTK_WIDGET (impl), gtk_bin_layout_new ());
+
  profile_end ("end", NULL);
 }

@@ -334,6 +334,13 @@ gtk_fixed_layout_init (GtkFixedLayout *self)
 {
 }

+/**
+ * gtk_fixed_layout_new:
+ *
+ * Creates a new #GtkFixedLayout.
+ *
+ * Returns: the newly created #GtkFixedLayout
+ */
 GtkLayoutManager *
 gtk_fixed_layout_new (void)
 {
@@ -55,6 +55,7 @@
 #include "gtkcombobox.h"
 #include "gtkgesturemultipress.h"
 #include "gtkeventcontrollerscroll.h"
+#include "gtkroot.h"

 #if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT)
 #include <pango/pangofc-font.h>
@@ -168,9 +169,6 @@ static void gtk_font_chooser_widget_get_property         (GObject         *objec
                                                          GParamSpec      *pspec);
 static void gtk_font_chooser_widget_finalize             (GObject         *object);

-static void gtk_font_chooser_widget_display_changed      (GtkWidget       *widget,
-                                                          GdkDisplay      *previous_display);
-
 static gboolean gtk_font_chooser_widget_find_font        (GtkFontChooserWidget *fontchooser,
                                                          const PangoFontDescription *font_desc,
                                                          GtkTreeIter          *iter);
@@ -617,6 +615,35 @@ rows_changed_cb (GtkFontChooserWidget *fontchooser)
    gtk_stack_set_visible_child_name (GTK_STACK (priv->list_stack), page);
 }

+static void
+update_key_capture (GtkWidget *chooser)
+{
+  GtkFontChooserWidgetPrivate *priv;
+  GtkWidget *capture_widget;
+
+ priv = gtk_font_chooser_widget_get_instance_private (GTK_FONT_CHOOSER_WIDGET (chooser));
+
+  if (gtk_widget_get_mapped (chooser) &&
+      g_str_equal (gtk_stack_get_visible_child_name (GTK_STACK (priv->stack)), "list"))
+    {
+      GtkWidget *toplevel;
+      GtkWidget *focus;
+
+      toplevel = gtk_widget_get_toplevel (chooser);
+      focus = gtk_root_get_focus (GTK_ROOT (toplevel));
+
+      if (GTK_IS_EDITABLE (focus) && focus != priv->search_entry)
+        capture_widget = NULL;
+      else
+        capture_widget = chooser;
+    }
+  else
+    capture_widget = NULL;
+
+  gtk_search_entry_set_key_capture_widget (GTK_SEARCH_ENTRY (priv->search_entry),
+                                           capture_widget);
+}
+
 static void
 gtk_font_chooser_widget_map (GtkWidget *widget)
 {
@@ -628,6 +655,53 @@ gtk_font_chooser_widget_map (GtkWidget *widget)
  g_simple_action_set_state (G_SIMPLE_ACTION (priv->tweak_action), g_variant_new_boolean (FALSE));

  GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->map (widget);
+
+  update_key_capture (widget);
+}
+
+static void
+gtk_font_chooser_widget_unmap (GtkWidget *widget)
+{
+  update_key_capture (widget);
+
+  GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->unmap (widget);
+}
+
+static void
+fontconfig_changed (GtkFontChooserWidget *fontchooser)
+{
+  gtk_font_chooser_widget_load_fonts (fontchooser, TRUE);
+}
+
+static void
+gtk_font_chooser_widget_root (GtkWidget *widget)
+{
+  GtkSettings *settings;
+
+  GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->root (widget);
+
+  g_signal_connect_swapped (gtk_widget_get_root (widget), "notify::focus-widget",
+                            G_CALLBACK (update_key_capture), widget);
+
+  settings = gtk_widget_get_settings (widget);
+  g_signal_connect_object (settings, "notify::gtk-fontconfig-timestamp",
+                           G_CALLBACK (fontconfig_changed), widget, G_CONNECT_SWAPPED);
+
+  gtk_font_chooser_widget_load_fonts (GTK_FONT_CHOOSER_WIDGET (widget), FALSE);
+ }
+
+static void
+gtk_font_chooser_widget_unroot (GtkWidget *widget)
+{
+  GtkSettings *settings;
+
+  g_signal_handlers_disconnect_by_func (gtk_widget_get_root (widget),
+                                        update_key_capture, widget);
+
+  settings = gtk_widget_get_settings (widget);
+  g_signal_handlers_disconnect_by_func (settings, fontconfig_changed, widget);
+
+  GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->unroot (widget);
 }

 static void
@@ -685,10 +759,12 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
  g_type_ensure (GTK_TYPE_DELAYED_FONT_DESCRIPTION);
  g_type_ensure (G_TYPE_THEMED_ICON);

-  widget_class->display_changed = gtk_font_chooser_widget_display_changed;
  widget_class->measure = gtk_font_chooser_widget_measure;
  widget_class->size_allocate = gtk_font_chooser_widget_size_allocate;
+  widget_class->root = gtk_font_chooser_widget_root;
+  widget_class->unroot = gtk_font_chooser_widget_unroot;
  widget_class->map = gtk_font_chooser_widget_map;
+  widget_class->unmap = gtk_font_chooser_widget_unmap;

  gobject_class->finalize = gtk_font_chooser_widget_finalize;
  gobject_class->dispose = gtk_font_chooser_widget_dispose;
@@ -876,9 +952,6 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser)

  gtk_font_chooser_widget_set_cell_size (fontchooser);
  gtk_font_chooser_widget_take_font_desc (fontchooser, NULL);
-
-  gtk_search_entry_set_key_capture_widget (GTK_SEARCH_ENTRY (priv->search_entry),
-                                           GTK_WIDGET (fontchooser));
 }

 /**
@@ -1250,40 +1323,6 @@ gtk_font_chooser_widget_find_font (GtkFontChooserWidget        *fontchooser,
  return valid;
 }

-static void
-fontconfig_changed (GtkFontChooserWidget *fontchooser)
-{
-  gtk_font_chooser_widget_load_fonts (fontchooser, TRUE);
-}
-
-static void
-gtk_font_chooser_widget_display_changed (GtkWidget  *widget,
-                                         GdkDisplay *previous_display)
-{
-  GtkFontChooserWidget *fontchooser = GTK_FONT_CHOOSER_WIDGET (widget);
-  GtkSettings *settings;
-
-  if (GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->display_changed)
-    GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->display_changed (widget, previous_display);
-
-  if (previous_display)
-    {
-      settings = gtk_settings_get_for_display (previous_display);
-      g_signal_handlers_disconnect_by_func (settings, fontconfig_changed, widget);
-    }
-  settings = gtk_widget_get_settings (widget);
-  g_signal_connect_object (settings, "notify::gtk-fontconfig-timestamp",
-                           G_CALLBACK (fontconfig_changed), widget, G_CONNECT_SWAPPED);
-
-  if (previous_display == NULL)
-    previous_display = gdk_display_get_default ();
-
-  if (previous_display == gtk_widget_get_display (widget))
-    return;
-
-  gtk_font_chooser_widget_load_fonts (fontchooser, FALSE);
-}
-
 static PangoFontFamily *
 gtk_font_chooser_widget_get_family (GtkFontChooser *chooser)
 {
@@ -628,7 +628,10 @@ gtk_gesture_filter_event (GtkEventController *controller,
   * subclasses which punch the holes in for the events
   * they can possibly handle.
   */
-  return EVENT_IS_TOUCHPAD_GESTURE (event);
+  if (EVENT_IS_TOUCHPAD_GESTURE (event))
+    return FALSE;
+
+  return GTK_EVENT_CONTROLLER_CLASS (gtk_gesture_parent_class)->filter_event (controller, event);
 }

 static gboolean
@@ -1726,7 +1726,7 @@ gtk_grid_layout_init (GtkGridLayout *self)
 }

 /**
- * gtk_grid_layou_new:
+ * gtk_grid_layout_new:
 *
 * Creates a new #GtkGridLayout.
 *
@@ -576,8 +576,6 @@ gtk_info_bar_add_button (GtkInfoBar  *info_bar,
  button = gtk_button_new_with_label (button_text);
  gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);

-  gtk_widget_set_can_default (button, TRUE);
-
  gtk_widget_show (button);

  gtk_info_bar_add_action_widget (info_bar, button, response_id);
@@ -744,7 +742,12 @@ gtk_info_bar_set_default_response (GtkInfoBar *info_bar,
      ResponseData *rd = get_response_data (widget, FALSE);

      if (rd && rd->response_id == response_id)
-        gtk_widget_grab_default (widget);
+        {
+          GtkWidget *window;
+
+          window = gtk_widget_get_ancestor (GTK_WIDGET (info_bar), GTK_TYPE_WINDOW);
+          gtk_window_set_default_widget (GTK_WINDOW (window), widget);
+        }
    }

  g_list_free (children);
@@ -456,8 +456,6 @@ static void gtk_label_set_markup_internal        (GtkLabel      *label,
 static void gtk_label_recalculate                (GtkLabel      *label);
 static void gtk_label_root                       (GtkWidget     *widget);
 static void gtk_label_unroot                     (GtkWidget     *widget);
-static void gtk_label_display_changed            (GtkWidget     *widget,
-						  GdkDisplay    *old_display);
 static gboolean gtk_label_popup_menu             (GtkWidget     *widget);

 static void gtk_label_set_selectable_hint (GtkLabel *label);
@@ -609,7 +607,6 @@ gtk_label_class_init (GtkLabelClass *class)
  widget_class->unmap = gtk_label_unmap;
  widget_class->root = gtk_label_root;
  widget_class->unroot = gtk_label_unroot;
-  widget_class->display_changed = gtk_label_display_changed;
  widget_class->mnemonic_activate = gtk_label_mnemonic_activate;
  widget_class->drag_data_get = gtk_label_drag_data_get;
  widget_class->grab_focus = gtk_label_grab_focus;
@@ -1803,28 +1800,6 @@ gtk_label_setup_mnemonic (GtkLabel  *label,
  g_object_set_qdata (G_OBJECT (label), quark_mnemonic_menu, mnemonic_menu);
 }

-static void
-gtk_label_root (GtkWidget *widget)
-{
-  GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPrivate *priv = gtk_label_get_instance_private (label);
-
-  GTK_WIDGET_CLASS (gtk_label_parent_class)->root (widget);
-
-  gtk_label_setup_mnemonic (label, gtk_widget_get_toplevel (widget), priv->mnemonic_keyval);
-}
-
-static void
-gtk_label_unroot (GtkWidget *widget)
-{
-  GtkLabel *label = GTK_LABEL (widget);
-  GtkLabelPrivate *priv = gtk_label_get_instance_private (label);
-
-  gtk_label_setup_mnemonic (label, NULL, priv->mnemonic_keyval);
-
-  GTK_WIDGET_CLASS (gtk_label_parent_class)->unroot (widget);
-}
-
 static void
 label_shortcut_setting_apply (GtkLabel *label)
 {
@@ -1861,6 +1836,50 @@ label_shortcut_setting_changed (GtkSettings *settings)
  g_list_free (list);
 }

+static void
+gtk_label_root (GtkWidget *widget)
+{
+  GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelPrivate *priv = gtk_label_get_instance_private (label);
+  GtkSettings *settings;
+  gboolean shortcuts_connected;
+
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->root (widget);
+
+  gtk_label_setup_mnemonic (label, gtk_widget_get_toplevel (widget), priv->mnemonic_keyval);
+
+  /* The PangoContext is replaced when the display changes, so clear the layouts */
+  gtk_label_clear_layout (GTK_LABEL (widget));
+
+  settings = gtk_widget_get_settings (widget);
+
+  shortcuts_connected =
+    GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (settings), quark_shortcuts_connected));
+
+  if (! shortcuts_connected)
+    {
+      g_signal_connect (settings, "notify::gtk-enable-accels",
+                        G_CALLBACK (label_shortcut_setting_changed),
+                        NULL);
+
+      g_object_set_qdata (G_OBJECT (settings), quark_shortcuts_connected,
+                         GINT_TO_POINTER (TRUE));
+    }
+
+  label_shortcut_setting_apply (GTK_LABEL (widget));
+}
+
+static void
+gtk_label_unroot (GtkWidget *widget)
+{
+  GtkLabel *label = GTK_LABEL (widget);
+  GtkLabelPrivate *priv = gtk_label_get_instance_private (label);
+
+  gtk_label_setup_mnemonic (label, NULL, priv->mnemonic_keyval);
+
+  GTK_WIDGET_CLASS (gtk_label_parent_class)->unroot (widget);
+}
+
 static void
 mnemonics_visible_apply (GtkWidget *widget,
                         gboolean   mnemonics_visible)
@@ -1913,35 +1932,6 @@ label_mnemonics_visible_changed (GtkWindow  *window,
                        GINT_TO_POINTER (mnemonics_visible));
 }

-static void
-gtk_label_display_changed (GtkWidget  *widget,
-			   GdkDisplay *old_display)
-{
-  GtkSettings *settings;
-  gboolean shortcuts_connected;
-
-  /* The PangoContext is replaced when the display changes, so clear the layouts */
-  gtk_label_clear_layout (GTK_LABEL (widget));
-
-  settings = gtk_widget_get_settings (widget);
-
-  shortcuts_connected =
-    GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (settings), quark_shortcuts_connected));
-
-  if (! shortcuts_connected)
-    {
-      g_signal_connect (settings, "notify::gtk-enable-accels",
-                        G_CALLBACK (label_shortcut_setting_changed),
-                        NULL);
-
-      g_object_set_qdata (G_OBJECT (settings), quark_shortcuts_connected,
-                         GINT_TO_POINTER (TRUE));
-    }
-
-  label_shortcut_setting_apply (GTK_LABEL (widget));
-}
-
-
 static void
 label_mnemonic_widget_weak_notify (gpointer      data,
 				   GObject      *where_the_object_was)
@@ -6203,31 +6193,9 @@ gtk_label_activate_current_link (GtkLabel *label)
  link = gtk_label_get_focus_link (label);

  if (link)
-    {
-      emit_activate_link (label, link);
-    }
+    emit_activate_link (label, link);
  else
-    {
-      GtkWidget *toplevel;
-      GtkWindow *window;
-      GtkWidget *default_widget, *focus_widget;
-
-      toplevel = gtk_widget_get_toplevel (widget);
-      if (GTK_IS_WINDOW (toplevel))
-        {
-          window = GTK_WINDOW (toplevel);
-
-          if (window)
-            {
-              default_widget = gtk_window_get_default_widget (window);
-              focus_widget = gtk_root_get_focus (GTK_ROOT (window));
-
-              if (default_widget != widget &&
-                  !(widget == focus_widget && (!default_widget || !gtk_widget_is_sensitive (default_widget))))
-                gtk_window_activate_default (window);
-            }
-        }
-    }
+    gtk_widget_activate_default (widget);
 }

 static GtkLabelLink *
@@ -1046,12 +1046,12 @@ menu_change_display (GtkMenu    *menu,
 }

 static void
-attach_widget_display_changed (GtkWidget  *attach_widget,
-                               GdkDisplay *previous_display,
-                               GtkMenu    *menu)
+attach_widget_root_changed (GObject    *attach_widget,
+                            GParamSpec *pspec,
+                            gpointer    menu)
 {
  if (!g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-display"))
-    menu_change_display (menu, gtk_widget_get_display (attach_widget));
+    menu_change_display (menu, gtk_widget_get_display (GTK_WIDGET (attach_widget)));
 }

 static void
@@ -1107,9 +1107,9 @@ gtk_menu_attach_to_widget (GtkMenu           *menu,
  data = g_slice_new (GtkMenuAttachData);
  data->attach_widget = attach_widget;

-  g_signal_connect (attach_widget, "display-changed",
-                    G_CALLBACK (attach_widget_display_changed), menu);
-  attach_widget_display_changed (attach_widget, NULL, menu);
+  g_signal_connect (attach_widget, "notify::root",
+                    G_CALLBACK (attach_widget_root_changed), menu);
+  attach_widget_root_changed (G_OBJECT (attach_widget), NULL, menu);

  data->detacher = detacher;
  g_object_set_data (G_OBJECT (menu), I_(attach_data_key), data);
@@ -1189,7 +1189,7 @@ gtk_menu_detach (GtkMenu *menu)
    }

  g_signal_handlers_disconnect_by_func (data->attach_widget,
-                                        (gpointer) attach_widget_display_changed,
+                                        (gpointer) attach_widget_root_changed,
                                        menu);

  if (data->detacher)
@@ -1266,6 +1266,8 @@ popup_grab_on_surface (GdkSurface *surface,
  GdkGrabStatus status;
  GdkSeat *seat;

+  g_return_val_if_fail (gdk_surface_get_display (surface) == gdk_device_get_display (pointer), FALSE);
+
  seat = gdk_device_get_seat (pointer);
  status = gdk_seat_grab (seat, surface,
                          GDK_SEAT_CAPABILITY_ALL, TRUE,
@@ -1321,7 +1323,11 @@ gtk_menu_popup_internal (GtkMenu             *menu,
    device = NULL;

  if (device == NULL)
-    device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
+    {
+      device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
+      g_return_if_fail (gdk_device_get_display (device) == display);
+    }
+

  widget = GTK_WIDGET (menu);
  menu_shell = GTK_MENU_SHELL (menu);
@@ -1331,6 +1337,8 @@ gtk_menu_popup_internal (GtkMenu             *menu,
  else
    pointer = device;

+  g_return_if_fail (gdk_device_get_display (pointer) == display);
+
  menu_shell->priv->parent_menu_shell = parent_menu_shell;

  /* Find the last viewable ancestor, and make an X grab on it
@@ -1437,7 +1445,7 @@ gtk_menu_popup_internal (GtkMenu             *menu,
  parent_toplevel = NULL;
  if (parent_menu_shell)
    parent_toplevel = gtk_widget_get_toplevel (parent_menu_shell);
-  else if (!g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-display"))
+  else
    {
      GtkWidget *attach_widget = gtk_menu_get_attach_widget (menu);
      if (attach_widget)
@@ -3604,35 +3612,6 @@ gtk_menu_select_item (GtkMenuShell *menu_shell,
  GTK_MENU_SHELL_CLASS (gtk_menu_parent_class)->select_item (menu_shell, menu_item);
 }

-/**
- * gtk_menu_set_display:
- * @menu: a #GtkMenu
- * @display: (allow-none): a #GdkDisplay, or %NULL if the display should be
- *           determined by the widget the menu is attached to
- *
- * Sets the #GdkDisplay on which the menu will be displayed.
- */
-void
-gtk_menu_set_display (GtkMenu    *menu,
-                      GdkDisplay *display)
-{
-  g_return_if_fail (GTK_IS_MENU (menu));
-  g_return_if_fail (display == NULL || GDK_IS_DISPLAY (display));
-
-  g_object_set_data (G_OBJECT (menu), I_("gtk-menu-explicit-display"), display);
-
-  if (display)
-    {
-      menu_change_display (menu, display);
-    }
-  else
-    {
-      GtkWidget *attach_widget = gtk_menu_get_attach_widget (menu);
-      if (attach_widget)
-        attach_widget_display_changed (attach_widget, NULL, menu);
-    }
-}
-
 static gint
 gtk_menu_get_popup_delay (GtkMenuShell *menu_shell)
 {
@@ -172,10 +172,6 @@ void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                           GtkWidget           *child,
                                           gint                position);

-GDK_AVAILABLE_IN_ALL
-void	   gtk_menu_set_display           (GtkMenu	       *menu,
-					   GdkDisplay          *display);
-
 GDK_AVAILABLE_IN_ALL
 void       gtk_menu_set_monitor           (GtkMenu             *menu,
                                           gint                 monitor_num);
@@ -118,8 +118,7 @@ static gboolean gtk_menu_shell_key_press     (GtkEventControllerKey *key,
                                              guint                  keycode,
                                              GdkModifierType        modifiers,
                                              GtkWidget             *widget);
-static void gtk_menu_shell_display_changed   (GtkWidget         *widget,
-                                              GdkDisplay        *previous_display);
+static void gtk_menu_shell_root              (GtkWidget         *widget);
 static void multi_press_pressed  (GtkGestureMultiPress *gesture,
                                  gint                  n_press,
                                  gdouble               x,
@@ -188,7 +187,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
  object_class->finalize = gtk_menu_shell_finalize;
  object_class->dispose = gtk_menu_shell_dispose;

-  widget_class->display_changed = gtk_menu_shell_display_changed;
+  widget_class->root = gtk_menu_shell_root;

  container_class->add = gtk_menu_shell_add;
  container_class->remove = gtk_menu_shell_remove;
@@ -945,9 +944,10 @@ gtk_menu_shell_key_press (GtkEventControllerKey *key,
 }

 static void
-gtk_menu_shell_display_changed (GtkWidget  *widget,
-                                GdkDisplay *previous_display)
+gtk_menu_shell_root (GtkWidget  *widget)
 {
+  GTK_WIDGET_CLASS (gtk_menu_shell_parent_class)->root (widget);
+
  gtk_menu_shell_reset_key_hash (GTK_MENU_SHELL (widget));
 }

@@ -455,7 +455,7 @@ pw_dialog_cycle_focus (GtkWidget         *widget,
  if (next_widget)
    gtk_widget_grab_focus (next_widget);
  else if (pw_dialog_input_is_valid (operation))
-    gtk_window_activate_default (GTK_WINDOW (priv->dialog));
+    gtk_widget_activate_default (widget);
 }

 static GtkWidget *
@@ -446,7 +446,7 @@ gtk_password_entry_new (void)
 /**
 * gtk_password_entry_set_show_peek_icon:
 * @entry: a #GtkPasswordEntry
- * show_peek_icon: whether to show the peek icon
+ * @show_peek_icon: whether to show the peek icon
 *
 * Sets whether the entry should have a clickable icon
 * to show the contents of the entry in clear text.
@@ -151,8 +151,8 @@ static gboolean gtk_path_bar_slider_down_defocus  (GtkWidget        *widget,
 						   GdkEventButton   *event,
 						   GtkPathBar       *path_bar);
 static void gtk_path_bar_style_updated            (GtkWidget        *widget);
-static void gtk_path_bar_display_changed          (GtkWidget        *widget,
-						   GdkDisplay       *previous_display);
+static void gtk_path_bar_root                     (GtkWidget        *widget);
+static void gtk_path_bar_unroot                   (GtkWidget        *widget);
 static void gtk_path_bar_check_icon_theme         (GtkPathBar       *path_bar);
 static void gtk_path_bar_update_button_appearance (GtkPathBar       *path_bar,
 						   ButtonData       *button_data,
@@ -273,7 +273,8 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
  widget_class->measure = gtk_path_bar_measure;
  widget_class->size_allocate = gtk_path_bar_size_allocate;
  widget_class->style_updated = gtk_path_bar_style_updated;
-  widget_class->display_changed = gtk_path_bar_display_changed;
+  widget_class->root = gtk_path_bar_root;
+  widget_class->unroot = gtk_path_bar_unroot;

  container_class->add = gtk_path_bar_add;
  container_class->forall = gtk_path_bar_forall;
@@ -729,19 +730,21 @@ gtk_path_bar_style_updated (GtkWidget *widget)
 }

 static void
-gtk_path_bar_display_changed (GtkWidget  *widget,
-			      GdkDisplay *previous_display)
+gtk_path_bar_root (GtkWidget *widget)
 {
-  if (GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->display_changed)
-    GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->display_changed (widget, previous_display);
-
-  /* We might nave a new settings, so we remove the old one */
-  if (previous_display)
-    remove_settings_signal (GTK_PATH_BAR (widget), previous_display);
+  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->root (widget);

  gtk_path_bar_check_icon_theme (GTK_PATH_BAR (widget));
 }

+static void
+gtk_path_bar_unroot (GtkWidget *widget)
+{
+  remove_settings_signal (GTK_PATH_BAR (widget), gtk_widget_get_display (widget));
+
+  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->unroot (widget);
+}
+
 static gboolean
 gtk_path_bar_scroll_controller_scroll (GtkEventControllerScroll *scroll,
                                       gdouble                   dx,
@@ -2688,7 +2688,6 @@ create_rename_popover (GtkPlacesSidebar *sidebar)
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
  g_free (str);
  button = gtk_button_new_with_mnemonic (_("_Rename"));
-  gtk_widget_set_can_default (button, TRUE);
  gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action");
  g_signal_connect (button, "clicked", G_CALLBACK (do_rename), sidebar);
  error = gtk_label_new ("");
@@ -155,6 +155,7 @@ enum {
  PROP_POSITION,
  PROP_MODAL,
  PROP_CONSTRAIN_TO,
+  PROP_DEFAULT_WIDGET,
  NUM_PROPERTIES
 };

@@ -345,6 +346,40 @@ gesture_released (GtkGestureMultiPress *gesture,
    gtk_popover_popdown (popover);
 }

+static void
+activate_default_cb (GSimpleAction *action,
+                     GVariant      *parameter,
+                     gpointer       data)
+{
+  GtkPopover *popover = data;
+  GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
+  GtkWidget *focus_widget;
+
+  focus_widget = gtk_window_get_focus (GTK_WINDOW (gtk_widget_get_root (priv->widget)));
+  if (priv->default_widget && gtk_widget_is_sensitive (priv->default_widget) &&
+      (!focus_widget || !gtk_widget_get_receives_default (focus_widget)))
+    gtk_widget_activate (priv->default_widget);
+  else if (focus_widget && gtk_widget_is_sensitive (focus_widget))
+    gtk_widget_activate (focus_widget);
+}
+
+static void
+add_actions (GtkPopover *popover)
+{
+  GActionEntry entries[] = {
+    { "activate", activate_default_cb, NULL, NULL, NULL },
+  };
+
+  GActionGroup *actions;
+
+  actions = G_ACTION_GROUP (g_simple_action_group_new ());
+  g_action_map_add_action_entries (G_ACTION_MAP (actions),
+                                   entries, G_N_ELEMENTS (entries),
+                                   popover);
+  gtk_widget_insert_action_group (GTK_WIDGET (popover), "default", actions);
+  g_object_unref (actions);
+}
+
 static void
 gtk_popover_init (GtkPopover *popover)
 {
@@ -389,6 +424,8 @@ gtk_popover_init (GtkPopover *popover)
  g_signal_connect (controller, "released",
                    G_CALLBACK (gesture_released), popover);
  gtk_widget_add_controller (widget, controller);
+
+  add_actions (popover);
 }

 static void
@@ -419,6 +456,10 @@ gtk_popover_set_property (GObject      *object,
      gtk_popover_set_constrain_to (GTK_POPOVER (object),
                                    g_value_get_enum (value));
      break;
+    case PROP_DEFAULT_WIDGET:
+      gtk_popover_set_default_widget (GTK_POPOVER (object),
+                                      g_value_get_object (value));
+      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    }
@@ -449,6 +490,9 @@ gtk_popover_get_property (GObject    *object,
    case PROP_CONSTRAIN_TO:
      g_value_set_enum (value, priv->constraint);
      break;
+    case PROP_DEFAULT_WIDGET:
+      g_value_set_object (value, priv->default_widget);
+      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    }
@@ -818,7 +862,7 @@ gtk_popover_map (GtkWidget *widget)
  gdk_surface_show (gtk_widget_get_surface (widget));
  gtk_popover_update_position (GTK_POPOVER (widget));

-  gtk_window_set_default (priv->window, priv->default_widget);
+  gtk_window_set_default_widget (priv->window, priv->default_widget);
 }

 static void
@@ -832,7 +876,7 @@ gtk_popover_unmap (GtkWidget *widget)
  GTK_WIDGET_CLASS (gtk_popover_parent_class)->unmap (widget);

  if (gtk_window_get_default_widget (priv->window) == priv->default_widget)
-    gtk_window_set_default (priv->window, priv->prev_default);
+    gtk_window_set_default_widget (priv->window, priv->prev_default);
  g_clear_object (&priv->prev_default);
 }

@@ -1645,6 +1689,13 @@ gtk_popover_class_init (GtkPopoverClass *klass)
                         GTK_TYPE_POPOVER_CONSTRAINT, GTK_POPOVER_CONSTRAINT_WINDOW,
                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);

+  properties[PROP_DEFAULT_WIDGET] =
+      g_param_spec_object ("default-widget",
+                           P_("Default widget"),
+                           P_("The default widget"),
+                           GTK_TYPE_WIDGET,
+                           GTK_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
+
  g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);

  /**
@@ -2378,7 +2429,6 @@ gtk_popover_set_default_widget (GtkPopover *popover,
  GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);

  g_return_if_fail (GTK_IS_POPOVER (popover));
-  g_return_if_fail (widget == NULL || gtk_widget_get_can_default (widget));

  if (priv->default_widget == widget)
    return;
@@ -2392,7 +2442,9 @@ gtk_popover_set_default_widget (GtkPopover *popover,
    g_object_ref (priv->default_widget);

  if (gtk_widget_get_mapped (GTK_WIDGET (popover)))
-    gtk_window_set_default (priv->window, priv->default_widget);
+    gtk_window_set_default_widget (priv->window, priv->default_widget);
+
+  g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_DEFAULT_WIDGET]);
 }

 /**
@@ -611,6 +611,16 @@ gtk_snapshot_ensure_identity (GtkSnapshot *snapshot)
    gtk_snapshot_autopush_transform (snapshot);
 }

+/**
+ * gtk_snapshot_push_repeat:
+ * @snapshot: a #GtkSnapshot
+ * @bounds: the bounds within which to repeat
+ * @child_bounds: the bounds of the child
+ *
+ * Creates a node that repeats the child node.
+ *
+ * The child is recorded until the next call to gtk_snapshot_pop().
+ */
 void
 gtk_snapshot_push_repeat (GtkSnapshot           *snapshot,
                          const graphene_rect_t *bounds,
@@ -809,6 +809,14 @@ button_released_cb (GtkGestureMultiPress *gesture,
    }
 }

+static void
+button_cancel_cb (GtkGesture       *gesture,
+                  GdkEventSequence *sequence,
+                  GtkSpinButton    *spin_button)
+{
+  gtk_spin_button_stop_spinning (spin_button);
+}
+
 static void
 key_controller_key_released (GtkEventControllerKey *key,
                             guint                  keyval,
@@ -886,6 +894,7 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
                                              GTK_PHASE_CAPTURE);
  g_signal_connect (gesture, "pressed", G_CALLBACK (button_pressed_cb), spin_button);
  g_signal_connect (gesture, "released", G_CALLBACK (button_released_cb), spin_button);
+  g_signal_connect (gesture, "cancel", G_CALLBACK (button_cancel_cb), spin_button);
  gtk_widget_add_controller (GTK_WIDGET (priv->down_button), GTK_EVENT_CONTROLLER (gesture));

  priv->up_button = gtk_button_new ();
@@ -902,6 +911,7 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
                                              GTK_PHASE_CAPTURE);
  g_signal_connect (gesture, "pressed", G_CALLBACK (button_pressed_cb), spin_button);
  g_signal_connect (gesture, "released", G_CALLBACK (button_released_cb), spin_button);
+  g_signal_connect (gesture, "cancel", G_CALLBACK (button_cancel_cb), spin_button);
  gtk_widget_add_controller (GTK_WIDGET (priv->up_button), GTK_EVENT_CONTROLLER (gesture));

  gtk_spin_button_set_adjustment (spin_button, NULL);
@@ -324,8 +324,7 @@ static void   gtk_text_direction_changed    (GtkWidget        *widget,
                                             GtkTextDirection  previous_dir);
 static void   gtk_text_state_flags_changed  (GtkWidget        *widget,
                                             GtkStateFlags     previous_state);
-static void   gtk_text_display_changed      (GtkWidget        *widget,
-                                             GdkDisplay       *old_display);
+static void   gtk_text_root                 (GtkWidget        *widget);

 static gboolean gtk_text_drag_drop          (GtkWidget        *widget,
                                             GdkDrop          *drop,
@@ -679,7 +678,7 @@ gtk_text_class_init (GtkTextClass *class)
  widget_class->drag_end = gtk_text_drag_end;
  widget_class->direction_changed = gtk_text_direction_changed;
  widget_class->state_flags_changed = gtk_text_state_flags_changed;
-  widget_class->display_changed = gtk_text_display_changed;
+  widget_class->root = gtk_text_root;
  widget_class->mnemonic_activate = gtk_text_mnemonic_activate;
  widget_class->popup_menu = gtk_text_popup_menu;
  widget_class->drag_drop = gtk_text_drag_drop;
@@ -3029,9 +3028,10 @@ gtk_text_state_flags_changed (GtkWidget     *widget,
 }

 static void
-gtk_text_display_changed (GtkWidget  *widget,
-                          GdkDisplay *old_display)
+gtk_text_root (GtkWidget *widget)
 {
+  GTK_WIDGET_CLASS (gtk_text_parent_class)->root (widget);
+
  gtk_text_recompute (GTK_TEXT (widget));
 }

@@ -3839,30 +3839,9 @@ static void
 gtk_text_real_activate (GtkText *self)
 {
  GtkTextPrivate *priv = gtk_text_get_instance_private (self);
-  GtkWindow *window;
-  GtkWidget *default_widget, *focus_widget;
-  GtkWidget *toplevel;
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (self);

  if (priv->activates_default)
-    {
-      toplevel = gtk_widget_get_toplevel (widget);
-      if (GTK_IS_WINDOW (toplevel))
-        {
-          window = GTK_WINDOW (toplevel);
-
-          if (window)
-            {
-              default_widget = gtk_window_get_default_widget (window);
-              focus_widget = gtk_root_get_focus (GTK_ROOT (window));
-              if (widget != default_widget &&
-                  !(widget == focus_widget && (!default_widget || !gtk_widget_get_sensitive (default_widget))))
-                gtk_window_activate_default (window);
-            }
-        }
-    }
+    gtk_widget_activate_default (GTK_WIDGET (self));
 }

 static void
@@ -6617,9 +6596,25 @@ gtk_text_get_tabs (GtkText *self)
  return priv->tabs;
 }

+static void
+emoji_picked (GtkEmojiChooser *chooser,
+              const char      *text,
+              GtkText         *self)
+{
+  int current_pos;
+  int selection_bound;
+
+  current_pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (chooser), "current-pos"));
+  selection_bound = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (chooser), "selection-bound"));
+
+  gtk_text_set_positions (self, current_pos, selection_bound);
+  gtk_text_enter_text (self, text);
+}
+
 static void
 gtk_text_insert_emoji (GtkText *self)
 {
+  GtkTextPrivate *priv = gtk_text_get_instance_private (self);
  GtkWidget *chooser;

  if (gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_EMOJI_CHOOSER) != NULL)
@@ -6632,9 +6627,12 @@ gtk_text_insert_emoji (GtkText *self)
      g_object_set_data (G_OBJECT (self), "gtk-emoji-chooser", chooser);

      gtk_popover_set_relative_to (GTK_POPOVER (chooser), GTK_WIDGET (self));
-      g_signal_connect_swapped (chooser, "emoji-picked", G_CALLBACK (gtk_text_enter_text), self);
+      g_signal_connect (chooser, "emoji-picked", G_CALLBACK (emoji_picked), self);
    }

+  g_object_set_data (G_OBJECT (chooser), "current-pos", GINT_TO_POINTER (priv->current_pos));
+  g_object_set_data (G_OBJECT (chooser), "selection-bound", GINT_TO_POINTER (priv->selection_bound));
+
  gtk_popover_popup (GTK_POPOVER (chooser));
 }

@@ -38,8 +38,7 @@ typedef struct _GtkTextClass         GtkTextClass;
 *   non-%NULL, this will be called to add additional entries to the context
 *   menu when it is displayed.
 * @activate: Class handler for the #GtkText::activate signal. The default
- *   implementation calls gtk_window_activate_default() on the entry’s top-level
- *   window.
+ *   implementation activates the gtk.activate-default action.
 * @move_cursor: Class handler for the #GtkText::move-cursor signal. The
 *   default implementation specifies the standard #GtkText cursor movement
 *   behavior.
@@ -201,7 +201,7 @@ limit_layout_lines (PangoLayout *layout)
 GdkPaintable *
 gtk_text_util_create_drag_icon (GtkWidget *widget,
                                gchar     *text,
-                                gsize      len)
+                                gssize     len)
 {
  GtkStyleContext *style_context;
  GtkSnapshot *snapshot;
@@ -40,7 +40,7 @@ void _gtk_text_util_append_special_char_menuitems (GtkMenuShell              *me

 GdkPaintable *    gtk_text_util_create_drag_icon  (GtkWidget     *widget,
                                                   gchar         *text,
-                                                   gsize          len);
+                                                   gssize         len);
 GdkPaintable *    gtk_text_util_create_rich_drag_icon (GtkWidget     *widget,
                                                   GtkTextBuffer *buffer,
                                                   GtkTextIter   *start,
@@ -186,8 +186,8 @@ static gboolean   gtk_toolbar_focus                (GtkWidget           *widget,
 						    GtkDirectionType     dir);
 static void       gtk_toolbar_move_focus           (GtkWidget           *widget,
 						    GtkDirectionType     dir);
-static void       gtk_toolbar_display_changed      (GtkWidget           *widget,
-						    GdkDisplay          *previous_display);
+static void       gtk_toolbar_root                 (GtkWidget           *widget);
+static void       gtk_toolbar_unroot               (GtkWidget           *widget);
 static void       gtk_toolbar_finalize             (GObject             *object);
 static void       gtk_toolbar_dispose              (GObject             *object);
 static void       gtk_toolbar_add                  (GtkContainer        *container,
@@ -362,7 +362,8 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                   GTK_TYPE_TOOLBAR,
                                   G_CALLBACK (gtk_toolbar_move_focus));

-  widget_class->display_changed = gtk_toolbar_display_changed;
+  widget_class->root = gtk_toolbar_root;
+  widget_class->unroot = gtk_toolbar_unroot;
  widget_class->popup_menu = gtk_toolbar_popup_menu;

  container_class->add    = gtk_toolbar_add;
@@ -1645,41 +1646,40 @@ settings_change_notify (GtkSettings      *settings,
 }

 static void
-gtk_toolbar_display_changed (GtkWidget *widget,
-			     GdkDisplay *previous_display)
+gtk_toolbar_root (GtkWidget *widget)
 {
  GtkToolbar *toolbar = GTK_TOOLBAR (widget);
  GtkToolbarPrivate *priv = toolbar->priv;
-  GtkSettings *old_settings = toolbar_get_settings (toolbar);
  GtkSettings *settings;
-  
+
+  GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->root (widget);
+
  settings = gtk_widget_get_settings (GTK_WIDGET (toolbar));
-  
-  if (settings == old_settings)
-    return;
-  
-  if (old_settings)
-    {
-      g_signal_handler_disconnect (old_settings, priv->settings_connection);
-      priv->settings_connection = 0;
-      g_object_unref (old_settings);
-    }

-  if (settings)
-    {
-      priv->settings_connection =
-	g_signal_connect (settings, "notify",
-                          G_CALLBACK (settings_change_notify),
-                          toolbar);
+  priv->settings_connection =
+    g_signal_connect (settings, "notify",
+                      G_CALLBACK (settings_change_notify),
+                      toolbar);

-      priv->settings = g_object_ref (settings);
-    }
-  else
-    priv->settings = NULL;
+  priv->settings = g_object_ref (settings);

  animation_change_notify (toolbar);
 }

+static void
+gtk_toolbar_unroot (GtkWidget *widget)
+{
+  GtkToolbar *toolbar = GTK_TOOLBAR (widget);
+  GtkToolbarPrivate *priv = toolbar->priv;
+
+  if (priv->settings_connection)
+    g_signal_handler_disconnect (priv->settings, priv->settings_connection);
+  priv->settings_connection = 0;
+  g_clear_object (&priv->settings);
+
+  GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unroot (widget);
+}
+
 static int
 find_drop_index (GtkToolbar *toolbar,
 		 gint        x,
@@ -689,8 +689,6 @@ gtk_tooltip_show_tooltip (GdkDisplay *display)
  tooltip = g_object_get_qdata (G_OBJECT (display), quark_current_tooltip);

  {
-    gint tx, ty;
-
    surface = tooltip->last_surface;

    if (!GDK_IS_SURFACE (surface))
@@ -702,7 +700,6 @@ gtk_tooltip_show_tooltip (GdkDisplay *display)
    x = round (px);
    y = round (py);

-    gdk_surface_get_root_coords (surface, x, y, &tx, &ty);
    tooltip_widget = _gtk_widget_find_at_coords (surface, x, y, &x, &y);
  }

@@ -398,11 +398,6 @@ struct _GtkTreeViewPrivate
  gint drag_pos;
  gint x_drag;

-  /* Non-interactive Header Resizing, expand flag support */
-  gint last_extra_space;
-  gint last_extra_space_per_column;
-  gint last_number_of_expand_columns;
-
  /* Row drag-and-drop */
  GtkTreeRowReference *drag_dest_row;
  GtkTreeViewDropPosition drag_dest_pos;
@@ -502,8 +497,6 @@ struct _GtkTreeViewPrivate

  guint in_grab : 1;

-  guint post_validation_flag : 1;
-
  /* Whether our key press handler is to avoid sending an unhandled binding to the search entry */
  guint search_entry_avoid_unhandled_binding : 1;

@@ -1704,8 +1697,6 @@ gtk_tree_view_init (GtkTreeView *tree_view)

  priv->tooltip_column = -1;

-  priv->post_validation_flag = FALSE;
-
  priv->event_last_x = -10000;
  priv->event_last_y = -10000;

@@ -2397,11 +2388,10 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
  GList *list, *first_column, *last_column;
  GtkTreeViewColumn *column;
  gint widget_width, width = 0;
-  gint extra, extra_per_column, extra_for_last;
+  gint extra, extra_per_column;
  gint full_requested_width = 0;
  gint number_of_expand_columns = 0;
  gboolean rtl;
-  gboolean update_expand;

  for (last_column = g_list_last (tree_view->priv->columns);
       last_column &&
@@ -2436,41 +2426,14 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
 	number_of_expand_columns++;
    }

-  /* Only update the expand value if the number of expand columns has changed,
-   * or if there are no expand columns, or if we didn't have an size-allocation
-   * yet after the last validated node.
-   */
-  update_expand = number_of_expand_columns != tree_view->priv->last_number_of_expand_columns
-      || number_of_expand_columns == 0
-      || tree_view->priv->post_validation_flag == TRUE;
-
-  tree_view->priv->post_validation_flag = FALSE;
-
  widget_width = gtk_widget_get_width (widget);
-  if (!update_expand)
-    {
-      extra = tree_view->priv->last_extra_space;
-      extra_for_last = MAX (widget_width - full_requested_width - extra, 0);
-    }
-  else
-    {
-      extra = MAX (widget_width - full_requested_width, 0);
-      extra_for_last = 0;
-
-      tree_view->priv->last_extra_space = extra;
-    }
+  extra = MAX (widget_width - full_requested_width, 0);

  if (number_of_expand_columns > 0)
    extra_per_column = extra/number_of_expand_columns;
  else
    extra_per_column = 0;

-  if (update_expand)
-    {
-      tree_view->priv->last_extra_space_per_column = extra_per_column;
-      tree_view->priv->last_number_of_expand_columns = number_of_expand_columns;
-    }
-
  for (list = first_column;
       list != last_column->next;
       list = list->next)
@@ -2507,12 +2470,6 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
 	  column_width += extra;
 	}

-      /* In addition to expand, the last column can get even more
-       * extra space so all available space is filled up.
-       */
-      if (extra_for_last > 0 && list == last_column)
-	column_width += extra_for_last;
-
      if (rtl)
        _gtk_tree_view_column_allocate (column, widget_width - width - column_width + x_offset,
                                        column_width, tree_view->priv->header_height);
@@ -2527,10 +2484,7 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
   * which changes the total width of the tree view.  This is of
   * importance for getting the horizontal scroll bar right.
   */
-  if (tree_view->priv->width != width)
-    {
-      tree_view->priv->width = width;
-    }
+  tree_view->priv->width = width;
 }

 /* GtkWidget::size_allocate helper */
@@ -5686,7 +5640,6 @@ validate_row (GtkTreeView   *tree_view,
      gtk_tree_rbtree_node_set_height (tree, node, height);
    }
  gtk_tree_rbtree_node_mark_valid (tree, node);
-  tree_view->priv->post_validation_flag = TRUE;

  return retval;
 }
@@ -9441,16 +9394,12 @@ gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
  GtkTreeRBTree *new_cursor_tree = NULL;
  GtkTreeRBNode *new_cursor_node = NULL;
  GtkTreePath *cursor_path = NULL;
-  gboolean grab_focus = TRUE;
  gboolean selectable;
  GtkDirectionType direction;
  GtkCellArea *cell_area = NULL;
  GtkCellRenderer *last_focus_cell = NULL;
  GtkTreeIter iter;

-  if (! gtk_widget_has_focus (GTK_WIDGET (tree_view)))
-    return;
-
  if (tree_view->priv->cursor_node == NULL)
    return;

@@ -9576,8 +9525,6 @@ gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
                                        count < 0 ?
                                        GTK_DIR_TAB_BACKWARD :
                                        GTK_DIR_TAB_FORWARD);
-
-              grab_focus = FALSE;
            }
        }
      else
@@ -9588,9 +9535,6 @@ gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
      if (cell_area)
 	gtk_cell_area_set_focus_cell (cell_area, last_focus_cell);
    }
-
-  if (grab_focus)
-    gtk_widget_grab_focus (GTK_WIDGET (tree_view));
 }

 static void
@@ -548,7 +548,6 @@ enum {
  PROP_IS_FOCUS,
  PROP_CAN_TARGET,
  PROP_FOCUS_ON_CLICK,
-  PROP_CAN_DEFAULT,
  PROP_HAS_DEFAULT,
  PROP_RECEIVES_DEFAULT,
  PROP_CURSOR,
@@ -633,8 +632,6 @@ static void             gtk_widget_real_move_focus              (GtkWidget
                                                                 GtkDirectionType  direction);
 static gboolean		gtk_widget_real_keynav_failed		(GtkWidget        *widget,
 								 GtkDirectionType  direction);
-static void             gtk_widget_root                         (GtkWidget        *widget);
-static void             gtk_widget_unroot                       (GtkWidget        *widget);
 #ifdef G_ENABLE_CONSISTENCY_CHECKS
 static void             gtk_widget_verify_invariants            (GtkWidget        *widget);
 static void             gtk_widget_push_verify_invariants       (GtkWidget        *widget);
@@ -676,10 +673,6 @@ static const gchar *    gtk_widget_buildable_get_name           (GtkBuildable
 static GObject *        gtk_widget_buildable_get_internal_child (GtkBuildable *buildable,
 								 GtkBuilder   *builder,
 								 const gchar  *childname);
-static void             gtk_widget_buildable_set_buildable_property (GtkBuildable     *buildable,
-								     GtkBuilder       *builder,
-								     const gchar      *name,
-								     const GValue     *value);
 static gboolean         gtk_widget_buildable_custom_tag_start   (GtkBuildable     *buildable,
                                                                 GtkBuilder       *builder,
                                                                 GObject          *child,
@@ -923,7 +916,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
  klass->drag_motion = NULL;
  klass->drag_drop = NULL;
  klass->drag_data_received = NULL;
-  klass->display_changed = NULL;
  klass->can_activate_accel = gtk_widget_real_can_activate_accel;
  klass->query_tooltip = gtk_widget_real_query_tooltip;
  klass->style_updated = gtk_widget_real_style_updated;
@@ -1037,19 +1029,12 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                            TRUE,
                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);

-  widget_props[PROP_CAN_DEFAULT] =
-      g_param_spec_boolean ("can-default",
-                            P_("Can default"),
-                            P_("Whether the widget can be the default widget"),
-                            FALSE,
-                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
-
  widget_props[PROP_HAS_DEFAULT] =
      g_param_spec_boolean ("has-default",
                            P_("Has default"),
                            P_("Whether the widget is the default widget"),
                            FALSE,
-                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+                            GTK_PARAM_READABLE|G_PARAM_EXPLICIT_NOTIFY);

  widget_props[PROP_RECEIVES_DEFAULT] =
      g_param_spec_boolean ("receives-default",
@@ -2089,25 +2074,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 		  NULL,
 		  G_TYPE_NONE, 0);

-  /**
-   * GtkWidget::display-changed:
-   * @widget: the object on which the signal is emitted
-   * @previous_display: (allow-none): the previous screen, or %NULL if the
-   *   widget was not associated with a screen before
-   *
-   * The ::display-changed signal gets emitted when the
-   * display of a widget has changed.
-   */
-  widget_signals[DISPLAY_CHANGED] =
-    g_signal_new (I_("display-changed"),
-		  G_TYPE_FROM_CLASS (klass),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GtkWidgetClass, display_changed),
-		  NULL, NULL,
-		  NULL,
-		  G_TYPE_NONE, 1,
-		  GDK_TYPE_DISPLAY);
-
  /**
   * GtkWidget::can-activate-accel:
   * @widget: the object which received the signal
@@ -2194,13 +2160,6 @@ gtk_widget_set_property (GObject         *object,
    case PROP_FOCUS_ON_CLICK:
      gtk_widget_set_focus_on_click (widget, g_value_get_boolean (value));
      break;
-    case PROP_CAN_DEFAULT:
-      gtk_widget_set_can_default (widget, g_value_get_boolean (value));
-      break;
-    case PROP_HAS_DEFAULT:
-      if (g_value_get_boolean (value))
-	gtk_widget_grab_default (widget);
-      break;
    case PROP_RECEIVES_DEFAULT:
      gtk_widget_set_receives_default (widget, g_value_get_boolean (value));
      break;
@@ -2375,9 +2334,6 @@ gtk_widget_get_property (GObject         *object,
    case PROP_FOCUS_ON_CLICK:
      g_value_set_boolean (value, gtk_widget_get_focus_on_click (widget));
      break;
-    case PROP_CAN_DEFAULT:
-      g_value_set_boolean (value, gtk_widget_get_can_default (widget));
-      break;
    case PROP_HAS_DEFAULT:
      g_value_set_boolean (value, gtk_widget_has_default (widget));
      break;
@@ -2887,21 +2843,22 @@ gtk_widget_new (GType        type,
  return widget;
 }

-static void
+void
 gtk_widget_root (GtkWidget *widget)
 {
  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);

-  /* roots are rooted by default */
-  if (GTK_IS_ROOT (widget))
-    return;
-
-  g_assert (priv->root == NULL);
  g_assert (!priv->realized);
-  g_assert (priv->parent);
-  g_assert (priv->parent->priv->root);

-  priv->root = priv->parent->priv->root;
+  if (GTK_IS_ROOT (widget))
+    {
+      g_assert (priv->root == GTK_ROOT (widget));
+    }
+  else
+    {
+      g_assert (priv->root == NULL);
+      priv->root = priv->parent->priv->root;
+    }

  if (priv->context)
    gtk_style_context_set_display (priv->context, gtk_root_get_display (priv->root));
@@ -2911,19 +2868,16 @@ gtk_widget_root (GtkWidget *widget)

  GTK_WIDGET_GET_CLASS (widget)->root (widget);

-  g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_ROOT]);
+  if (!GTK_IS_ROOT (widget))
+    g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_ROOT]);
 }

-static void
+void
 gtk_widget_unroot (GtkWidget *widget)
 {
  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
  GtkWidgetSurfaceTransformData *surface_transform_data;

-  /* roots are rooted by default and cannot be unrooted */
-  if (GTK_IS_ROOT (widget))
-    return;
-
  g_assert (priv->root);
  g_assert (!priv->realized);

@@ -2937,9 +2891,16 @@ gtk_widget_unroot (GtkWidget *widget)
  if (priv->context)
    gtk_style_context_set_display (priv->context, gdk_display_get_default ());

-  priv->root = NULL;
+  if (g_object_get_qdata (G_OBJECT (widget), quark_pango_context))
+    g_object_set_qdata (G_OBJECT (widget), quark_pango_context, NULL);

-  g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_ROOT]);
+  _gtk_tooltip_hide (widget);
+
+  if (!GTK_IS_ROOT (widget))
+    {
+      priv->root = NULL;
+      g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_ROOT]);
+    }
 }

 /**
@@ -5478,7 +5439,8 @@ static void
 gtk_widget_real_grab_focus (GtkWidget *focus_widget)
 {
  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (focus_widget);
-  gtk_root_set_focus (priv->root, focus_widget);
+  if (priv->root)
+    gtk_root_set_focus (priv->root, focus_widget);
 }

 static gboolean
@@ -5818,58 +5780,12 @@ gtk_widget_get_focus_on_click (GtkWidget *widget)
  return priv->focus_on_click;
 }

-
-/**
- * gtk_widget_set_can_default:
- * @widget: a #GtkWidget
- * @can_default: whether or not @widget can be a default widget.
- *
- * Specifies whether @widget can be a default widget. See
- * gtk_widget_grab_default() for details about the meaning of
- * “default”.
- **/
-void
-gtk_widget_set_can_default (GtkWidget *widget,
-                            gboolean   can_default)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  if (priv->can_default != can_default)
-    {
-      priv->can_default = can_default;
-
-      gtk_widget_queue_resize (widget);
-      g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_CAN_DEFAULT]);
-    }
-}
-
-/**
- * gtk_widget_get_can_default:
- * @widget: a #GtkWidget
- *
- * Determines whether @widget can be a default widget. See
- * gtk_widget_set_can_default().
- *
- * Returns: %TRUE if @widget can be a default widget, %FALSE otherwise
- **/
-gboolean
-gtk_widget_get_can_default (GtkWidget *widget)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-
-  return priv->can_default;
-}
-
 /**
 * gtk_widget_has_default:
 * @widget: a #GtkWidget
 *
 * Determines whether @widget is the current default widget within its
- * toplevel. See gtk_widget_set_can_default().
+ * toplevel.
 *
 * Returns: %TRUE if @widget is the current default widget within
 *     its toplevel, %FALSE otherwise
@@ -5901,47 +5817,14 @@ _gtk_widget_set_has_default (GtkWidget *widget,
    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_DEFAULT);
 }

-/**
- * gtk_widget_grab_default:
- * @widget: a #GtkWidget
- *
- * Causes @widget to become the default widget. @widget must be able to be
- * a default widget; typically you would ensure this yourself
- * by calling gtk_widget_set_can_default() with a %TRUE value.
- * The default widget is activated when
- * the user presses Enter in a window. Default widgets must be
- * activatable, that is, gtk_widget_activate() should affect them. Note
- * that #GtkEntry widgets require the “activates-default” property
- * set to %TRUE before they activate the default widget when Enter
- * is pressed and the #GtkEntry is focused.
- **/
-void
-gtk_widget_grab_default (GtkWidget *widget)
-{
-  GtkWidget *window;
-
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (gtk_widget_get_can_default (widget));
-
-  window = _gtk_widget_get_toplevel (widget);
-
-  if (window && _gtk_widget_is_toplevel (window))
-    gtk_window_set_default (GTK_WINDOW (window), widget);
-  else
-    g_warning (G_STRLOC ": widget not within a GtkWindow");
-}
-
 /**
 * gtk_widget_set_receives_default:
 * @widget: a #GtkWidget
 * @receives_default: whether or not @widget can be a default widget.
 *
- * Specifies whether @widget will be treated as the default widget
- * within its toplevel when it has the focus, even if another widget
- * is the default.
- *
- * See gtk_widget_grab_default() for details about the meaning of
- * “default”.
+ * Specifies whether @widget will be treated as the default
+ * widget within its toplevel when it has the focus, even if
+ * another widget is the default.
 **/
 void
 gtk_widget_set_receives_default (GtkWidget *widget,
@@ -6480,6 +6363,7 @@ gtk_widget_set_sensitive (GtkWidget *widget,
 			  gboolean   sensitive)
 {
  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+  GList *l;

  g_return_if_fail (GTK_IS_WIDGET (widget));

@@ -6490,6 +6374,13 @@ gtk_widget_set_sensitive (GtkWidget *widget,

  priv->sensitive = sensitive;

+  for (l = priv->event_controllers; l; l = l->next)
+    {
+      GtkEventController *controller = l->data;
+
+      gtk_event_controller_set_responsive (controller, sensitive);
+    }
+
  if (priv->parent == NULL
      || gtk_widget_is_sensitive (priv->parent))
    {
@@ -6791,84 +6682,6 @@ gtk_widget_real_direction_changed (GtkWidget        *widget,
  gtk_widget_queue_resize (widget);
 }

-typedef struct {
-  GtkWidget *previous_toplevel;
-  GdkDisplay *previous_display;
-  GdkDisplay *new_display;
-} HierarchyChangedInfo;
-
-static void
-do_display_change (GtkWidget  *widget,
-	           GdkDisplay *old_display,
-                   GdkDisplay *new_display)
-{
-  if (old_display != new_display)
-    {
-      GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-      if (old_display)
-	{
-	  PangoContext *context = g_object_get_qdata (G_OBJECT (widget), quark_pango_context);
-	  if (context)
-	    g_object_set_qdata (G_OBJECT (widget), quark_pango_context, NULL);
-	}
-
-      _gtk_tooltip_hide (widget);
-
-      if (new_display && priv->context)
-        gtk_style_context_set_display (priv->context, new_display);
-
-      g_signal_emit (widget, widget_signals[DISPLAY_CHANGED], 0, old_display);
-    }
-}
-
-static void
-gtk_widget_propagate_display_changed_recurse (GtkWidget *widget,
-	                  		      gpointer   client_data)
-{
-  HierarchyChangedInfo *info = client_data;
-  GtkWidget *child;
-
-  g_object_ref (widget);
-
-  do_display_change (widget, info->previous_display, info->new_display);
-
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      gtk_widget_propagate_display_changed_recurse (child, client_data);
-    }
-
-  g_object_unref (widget);
-}
-
-/**
- * _gtk_widget_propagate_display_changed:
- * @widget: a #GtkWidget
- * @previous_display: Previous display
- *
- * Propagates changes in the display for a widget to all
- * children, emitting #GtkWidget::display-changed.
- **/
-void
-_gtk_widget_propagate_display_changed (GtkWidget  *widget,
-                                       GdkDisplay *previous_display)
-{
-  HierarchyChangedInfo info;
-
-  info.previous_display = previous_display;
-  info.new_display = gtk_widget_get_display (widget);
-
-  if (previous_display)
-    g_object_ref (previous_display);
-
-  gtk_widget_propagate_display_changed_recurse (widget, &info);
-
-  if (previous_display)
-    g_object_unref (previous_display);
-}
-
 static void
 reset_style_recurse (GtkWidget *widget, gpointer user_data)
 {
@@ -9589,8 +9402,6 @@ gtk_widget_set_vexpand_set (GtkWidget      *widget,
 /*
 * GtkBuildable implementation
 */
-static GQuark		 quark_builder_has_default = 0;
-static GQuark		 quark_builder_has_focus = 0;
 static GQuark		 quark_builder_atk_relations = 0;
 static GQuark            quark_builder_set_name = 0;

@@ -9622,15 +9433,12 @@ gtk_widget_buildable_add_child (GtkBuildable  *buildable,
 static void
 gtk_widget_buildable_interface_init (GtkBuildableIface *iface)
 {
-  quark_builder_has_default = g_quark_from_static_string ("gtk-builder-has-default");
-  quark_builder_has_focus = g_quark_from_static_string ("gtk-builder-has-focus");
  quark_builder_atk_relations = g_quark_from_static_string ("gtk-builder-atk-relations");
  quark_builder_set_name = g_quark_from_static_string ("gtk-builder-set-name");

  iface->set_name = gtk_widget_buildable_set_name;
  iface->get_name = gtk_widget_buildable_get_name;
  iface->get_internal_child = gtk_widget_buildable_get_internal_child;
-  iface->set_buildable_property = gtk_widget_buildable_set_buildable_property;
  iface->parser_finished = gtk_widget_buildable_parser_finished;
  iface->custom_tag_start = gtk_widget_buildable_custom_tag_start;
  iface->custom_tag_end = gtk_widget_buildable_custom_tag_end;
@@ -9695,22 +9503,6 @@ gtk_widget_buildable_get_internal_child (GtkBuildable *buildable,
  return NULL;
 }

-static void
-gtk_widget_buildable_set_buildable_property (GtkBuildable *buildable,
-					     GtkBuilder   *builder,
-					     const gchar  *name,
-					     const GValue *value)
-{
-  if (strcmp (name, "has-default") == 0 && g_value_get_boolean (value))
-      g_object_set_qdata (G_OBJECT (buildable), quark_builder_has_default,
-			  GINT_TO_POINTER (TRUE));
-  else if (strcmp (name, "has-focus") == 0 && g_value_get_boolean (value))
-      g_object_set_qdata (G_OBJECT (buildable), quark_builder_has_focus,
-			  GINT_TO_POINTER (TRUE));
-  else
-    g_object_set_property (G_OBJECT (buildable), name, value);
-}
-
 typedef struct
 {
  gchar *action_name;
@@ -9749,18 +9541,6 @@ gtk_widget_buildable_parser_finished (GtkBuildable *buildable,
 {
  GSList *atk_relations;

-  if (g_object_get_qdata (G_OBJECT (buildable), quark_builder_has_default))
-    {
-      gtk_widget_grab_default (GTK_WIDGET (buildable));
-      g_object_steal_qdata (G_OBJECT (buildable), quark_builder_has_default);
-    }
-
-  if (g_object_get_qdata (G_OBJECT (buildable), quark_builder_has_focus))
-    {
-      gtk_widget_grab_focus (GTK_WIDGET (buildable));
-      g_object_steal_qdata (G_OBJECT (buildable), quark_builder_has_focus);
-    }
-
  atk_relations = g_object_get_qdata (G_OBJECT (buildable),
 				      quark_builder_atk_relations);
  if (atk_relations)
@@ -12900,6 +12680,48 @@ gtk_widget_get_action_group (GtkWidget   *widget,
  return NULL;
 }

+/**
+ * gtk_widget_activate_action:
+ * @widget: a #GtkWidget
+ * @name: a prefixed action name
+ * @parameter: parameters that required by the action
+ *
+ * Looks up the action in the action groups associated
+ * with @widget and its ancestors, and activates it.
+ *
+ * The action name is expected to be prefixed with the
+ * prefix that was used when adding the action group
+ * with gtk_widget_insert_action_group().
+ *
+ * The @parameter must match the actions expected parameter
+ * type, as returned by g_action_get_parameter_type().
+ */
+void
+gtk_widget_activate_action (GtkWidget  *widget,
+                            const char *name,
+                            GVariant   *parameter)
+{
+  GtkActionMuxer *muxer;
+
+  muxer = _gtk_widget_get_action_muxer (widget, FALSE);
+  if (muxer)
+    g_action_group_activate_action (G_ACTION_GROUP (muxer),
+                                    name,
+                                    parameter);
+}
+
+/**
+ * gtk_widget_activate_default:
+ * @widget: a #GtkWidget
+ *
+ * Activate the default.activate action from @widget.
+ */
+void
+gtk_widget_activate_default (GtkWidget *widget)
+{
+  gtk_widget_activate_action (widget, "default.activate", NULL);
+}
+
 void
 gtk_widget_cancel_event_sequence (GtkWidget             *widget,
                                  GtkGesture            *gesture,
@@ -209,8 +209,6 @@ struct _GtkWidget
 *   context menu.
 * @get_accessible: Returns the accessible object that describes the
 *   widget to an assistive technology.
- * @display_changed: Signal emitted when the #GdkDisplay of a widget has
- *   changed.
 * @can_activate_accel: Signal allows applications and derived widgets
 *   to override the default GtkWidget handling for determining whether
 *   an accelerator can be activated.
@@ -314,8 +312,6 @@ struct _GtkWidgetClass
   */
  AtkObject *  (* get_accessible)     (GtkWidget       *widget);

-  void         (* display_changed)     (GtkWidget      *widget,
-                                        GdkDisplay     *previous_display);
  gboolean     (* can_activate_accel) (GtkWidget *widget,
                                       guint      signal_id);

@@ -474,16 +470,8 @@ void       gtk_widget_set_can_target      (GtkWidget           *widget,
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_get_can_target      (GtkWidget           *widget);

-
-GDK_AVAILABLE_IN_ALL
-void       gtk_widget_set_can_default     (GtkWidget           *widget,
-                                           gboolean             can_default);
-GDK_AVAILABLE_IN_ALL
-gboolean   gtk_widget_get_can_default     (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_has_default         (GtkWidget           *widget);
-GDK_AVAILABLE_IN_ALL
-void       gtk_widget_grab_default        (GtkWidget           *widget);

 GDK_AVAILABLE_IN_ALL
 void      gtk_widget_set_receives_default (GtkWidget           *widget,
@@ -1011,6 +999,14 @@ GActionGroup           *gtk_widget_get_action_group     (GtkWidget             *
 GDK_AVAILABLE_IN_ALL
 const gchar **          gtk_widget_list_action_prefixes (GtkWidget             *widget);

+GDK_AVAILABLE_IN_ALL
+void                    gtk_widget_activate_action      (GtkWidget  *widget,
+                                                         const char *name,
+                                                         GVariant   *parameter);
+
+GDK_AVAILABLE_IN_ALL
+void                   gtk_widget_activate_default      (GtkWidget *widget);
+
 GDK_AVAILABLE_IN_ALL
 void                    gtk_widget_set_font_map         (GtkWidget             *widget,
                                                         PangoFontMap          *font_map);
@@ -81,7 +81,6 @@ struct _GtkWidgetPrivate
  guint can_focus             : 1;
  guint has_focus             : 1;
  guint focus_on_click        : 1;
-  guint can_default           : 1;
  guint has_default           : 1;
  guint receives_default      : 1;
  guint has_grab              : 1;
@@ -210,6 +209,8 @@ struct _GtkWidgetPrivate
  GdkCursor *cursor;
 };

+void          gtk_widget_root               (GtkWidget *widget);
+void          gtk_widget_unroot             (GtkWidget *widget);
 GtkCssNode *  gtk_widget_get_css_node       (GtkWidget *widget);
 void         _gtk_widget_set_visible_flag   (GtkWidget *widget,
                                             gboolean   visible);
@@ -325,6 +325,8 @@ enum {
  PROP_TRANSIENT_FOR,
  PROP_ATTACHED_TO,
  PROP_APPLICATION,
+  PROP_DEFAULT_WIDGET,
+
  /* Readonly properties */
  PROP_IS_ACTIVE,

@@ -429,7 +431,6 @@ static void gtk_window_move_focus         (GtkWidget         *widget,
                                           GtkDirectionType   dir);

 static void gtk_window_real_activate_default (GtkWindow         *window);
-static void gtk_window_real_activate_focus   (GtkWindow         *window);
 static void gtk_window_keys_changed          (GtkWindow         *window);
 static gboolean gtk_window_enable_debugging  (GtkWindow         *window,
                                              gboolean           toggle);
@@ -801,7 +802,6 @@ gtk_window_class_init (GtkWindowClass *klass)
  container_class->forall = gtk_window_forall;

  klass->activate_default = gtk_window_real_activate_default;
-  klass->activate_focus = gtk_window_real_activate_focus;
  klass->keys_changed = gtk_window_keys_changed;
  klass->enable_debugging = gtk_window_enable_debugging;
  klass->close_request = gtk_window_close_request;
@@ -1057,6 +1057,13 @@ gtk_window_class_init (GtkWindowClass *klass)
                           GTK_TYPE_APPLICATION,
                           GTK_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);

+  window_props[PROP_DEFAULT_WIDGET] =
+      g_param_spec_object ("default-widget",
+                           P_("Default widget"),
+                           P_("The default widget"),
+                           GTK_TYPE_WIDGET,
+                           GTK_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
+
  g_object_class_install_properties (gobject_class, LAST_ARG, window_props);
  gtk_root_install_properties (gobject_class, LAST_ARG);

@@ -1766,6 +1773,31 @@ gtk_window_capture_motion (GtkWidget *widget,
  gtk_widget_set_cursor (widget, NULL);
 }

+static void
+activate_default_cb (GSimpleAction *action,
+                     GVariant      *parameter,
+                     gpointer       data)
+{
+  gtk_window_real_activate_default (GTK_WINDOW (data));
+}
+
+static void
+add_actions (GtkWindow *window)
+{
+  GActionEntry entries[] = {
+    { "activate", activate_default_cb, NULL, NULL, NULL },
+  };
+
+  GActionGroup *actions;
+
+  actions = G_ACTION_GROUP (g_simple_action_group_new ());
+  g_action_map_add_action_entries (G_ACTION_MAP (actions),
+                                   entries, G_N_ELEMENTS (entries),
+                                   window);
+  gtk_widget_insert_action_group (GTK_WIDGET (window), "default", actions);
+  g_object_unref (actions);
+}
+
 static void
 gtk_window_init (GtkWindow *window)
 {
@@ -1859,6 +1891,8 @@ gtk_window_init (GtkWindow *window)
  g_signal_connect_swapped (priv->key_controller, "focus-out",
                            G_CALLBACK (gtk_window_focus_out), window);
  gtk_widget_add_controller (widget, priv->key_controller);
+
+  add_actions (window);
 }

 static GtkGesture *
@@ -1985,6 +2019,9 @@ gtk_window_set_property (GObject      *object,
    case PROP_APPLICATION:
      gtk_window_set_application (window, g_value_get_object (value));
      break;
+    case PROP_DEFAULT_WIDGET:
+      gtk_window_set_default_widget (window, g_value_get_object (value));
+      break;
    case PROP_MNEMONICS_VISIBLE:
      gtk_window_set_mnemonics_visible (window, g_value_get_boolean (value));
      break;
@@ -2082,6 +2119,9 @@ gtk_window_get_property (GObject      *object,
    case PROP_APPLICATION:
      g_value_set_object (value, gtk_window_get_application (window));
      break;
+    case PROP_DEFAULT_WIDGET:
+      g_value_set_object (value, gtk_window_get_default_widget (window));
+      break;
    case PROP_MNEMONICS_VISIBLE:
      g_value_set_boolean (value, priv->mnemonics_visible);
      break;
@@ -2134,8 +2174,10 @@ gtk_window_buildable_set_buildable_property (GtkBuildable *buildable,

  if (strcmp (name, "visible") == 0 && g_value_get_boolean (value))
    priv->builder_visible = TRUE;
-  else
+  else if (parent_buildable_iface->set_buildable_property)
    parent_buildable_iface->set_buildable_property (buildable, builder, name, value);
+  else
+    g_object_set_property (G_OBJECT (buildable), name, value);
 }

 typedef struct {
@@ -2514,34 +2556,27 @@ gtk_window_set_startup_id (GtkWindow   *window,
 }

 /**
- * gtk_window_set_default:
+ * gtk_window_set_default_widget:
 * @window: a #GtkWindow
 * @default_widget: (allow-none): widget to be the default, or %NULL
 *     to unset the default widget for the toplevel
 *
 * The default widget is the widget that’s activated when the user
 * presses Enter in a dialog (for example). This function sets or
- * unsets the default widget for a #GtkWindow. When setting (rather
- * than unsetting) the default widget it’s generally easier to call
- * gtk_widget_grab_default() on the widget. Before making a widget
- * the default widget, you must call gtk_widget_set_can_default() on
- * the widget you’d like to make the default.
+ * unsets the default widget for a #GtkWindow.
 */
 void
-gtk_window_set_default (GtkWindow *window,
-			GtkWidget *default_widget)
+gtk_window_set_default_widget (GtkWindow *window,
+                               GtkWidget *default_widget)
 {
  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);

  g_return_if_fail (GTK_IS_WINDOW (window));

-  if (default_widget)
-    g_return_if_fail (gtk_widget_get_can_default (default_widget));
-
  if (priv->default_widget != default_widget)
    {
      GtkWidget *old_default_widget = NULL;
-      
+
      if (default_widget)
 	g_object_ref (default_widget);

@@ -2569,12 +2604,14 @@ gtk_window_set_default (GtkWindow *window,

      if (old_default_widget)
 	g_object_notify (G_OBJECT (old_default_widget), "has-default");
-      
+
      if (default_widget)
 	{
 	  g_object_notify (G_OBJECT (default_widget), "has-default");
 	  g_object_unref (default_widget);
 	}
+
+      g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_DEFAULT_WIDGET]);
    }
 }

@@ -2836,27 +2873,6 @@ gtk_window_set_position (GtkWindow         *window,
    }
 }

-/**
- * gtk_window_activate_focus:
- * @window: a #GtkWindow
- * 
- * Activates the current focused widget within the window.
- * 
- * Returns: %TRUE if a widget got activated.
- **/
-gboolean 
-gtk_window_activate_focus (GtkWindow *window)
-{
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-
-  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
-
-  if (priv->focus_widget && gtk_widget_is_sensitive (priv->focus_widget))
-    return gtk_widget_activate (priv->focus_widget);
-
-  return FALSE;
-}
-
 /**
 * gtk_window_get_focus:
 * @window: a #GtkWindow
@@ -2883,31 +2899,16 @@ gtk_window_get_focus (GtkWindow *window)
    return priv->focus_widget;
 }

-/**
- * gtk_window_activate_default:
- * @window: a #GtkWindow
- * 
- * Activates the default widget for the window, unless the current 
- * focused widget has been configured to receive the default action 
- * (see gtk_widget_set_receives_default()), in which case the
- * focused widget is activated. 
- * 
- * Returns: %TRUE if a widget got activated.
- **/
-gboolean
-gtk_window_activate_default (GtkWindow *window)
+static void
+gtk_window_real_activate_default (GtkWindow *window)
 {
  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);

-  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
-
  if (priv->default_widget && gtk_widget_is_sensitive (priv->default_widget) &&
      (!priv->focus_widget || !gtk_widget_get_receives_default (priv->focus_widget)))
-    return gtk_widget_activate (priv->default_widget);
+    gtk_widget_activate (priv->default_widget);
  else if (priv->focus_widget && gtk_widget_is_sensitive (priv->focus_widget))
-    return gtk_widget_activate (priv->focus_widget);
-
-  return FALSE;
+    gtk_widget_activate (priv->focus_widget);
 }

 /**
@@ -3050,7 +3051,7 @@ gtk_window_dispose (GObject *object)
  priv->foci = NULL;

  gtk_window_set_focus (window, NULL);
-  gtk_window_set_default (window, NULL);
+  gtk_window_set_default_widget (window, NULL);
  remove_attach_widget (window);

  G_OBJECT_CLASS (gtk_window_parent_class)->dispose (object);
@@ -6229,18 +6230,6 @@ get_active_region_type (GtkWindow *window, gint x, gint y)
  return GTK_WINDOW_REGION_CONTENT;
 }

-static void
-gtk_window_real_activate_default (GtkWindow *window)
-{
-  gtk_window_activate_default (window);
-}
-
-static void
-gtk_window_real_activate_focus (GtkWindow *window)
-{
-  gtk_window_activate_focus (window);
-}
-
 static void
 do_focus_change (GtkWidget *widget,
                 gboolean   in)
@@ -6524,6 +6513,9 @@ gtk_window_set_focus (GtkWindow *window,
  if (focus && !gtk_widget_is_sensitive (focus))
    return;

+  if (focus == priv->focus_widget)
+    return;
+
  if (priv->focus_widget)
    old_focus = g_object_ref (priv->focus_widget);
  g_set_object (&priv->focus_widget, NULL);
@@ -6625,7 +6617,7 @@ _gtk_window_unset_focus_and_default (GtkWindow *window,
    child = _gtk_widget_get_parent (child);

  if (child == widget)
-    gtk_window_set_default (window, NULL);
+    gtk_window_set_default_widget (window, NULL);
  
  g_object_unref (widget);
  g_object_unref (window);
@@ -8518,7 +8510,9 @@ gtk_window_set_display (GtkWindow  *window,
                    G_CALLBACK (gtk_window_on_theme_variant_changed), window);
 #endif

-  _gtk_widget_propagate_display_changed (widget, previous_display);
+  gtk_widget_unroot (widget);
+  gtk_widget_root (widget);
+
  g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_DISPLAY]);

  if (was_mapped)
@@ -9884,13 +9878,19 @@ update_cursor (GtkWindow *toplevel,
               GtkWidget *target)
 {
  GdkCursor *cursor = NULL;
+  GdkSurface *surface;
+
+  surface = gtk_widget_get_surface (target);

  if (grab_widget && !gtk_widget_is_ancestor (target, grab_widget))
    {
      /* Outside the grab widget, cursor stays to whatever the grab
       * widget says.
       */
-      cursor = gtk_widget_get_cursor (grab_widget);
+      if (gtk_widget_get_surface (grab_widget) == gtk_widget_get_surface (target))
+        cursor = gtk_widget_get_cursor (grab_widget);
+      else
+        cursor = NULL;
    }
  else
    {
@@ -9911,8 +9911,7 @@ update_cursor (GtkWindow *toplevel,
        }
    }

-  gdk_surface_set_device_cursor (gtk_widget_get_surface (GTK_WIDGET (toplevel)),
-                                 device, cursor);
+  gdk_surface_set_device_cursor (surface, device, cursor);
 }

 void
@@ -158,19 +158,15 @@ GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_position             (GtkWindow           *window,
 						GtkWindowPosition    position);
 GDK_AVAILABLE_IN_ALL
-gboolean   gtk_window_activate_focus	       (GtkWindow           *window);
-GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_focus                (GtkWindow           *window,
 						GtkWidget           *focus);
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_window_get_focus                (GtkWindow           *window);
 GDK_AVAILABLE_IN_ALL
-void       gtk_window_set_default              (GtkWindow           *window,
+void       gtk_window_set_default_widget       (GtkWindow           *window,
 						GtkWidget           *default_widget);
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_window_get_default_widget       (GtkWindow           *window);
-GDK_AVAILABLE_IN_ALL
-gboolean   gtk_window_activate_default	       (GtkWindow           *window);

 GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_transient_for        (GtkWindow           *window,
@@ -216,11 +216,9 @@ gtk_inspector_actions_set_object (GtkInspectorActions *sl,
  g_hash_table_remove_all (sl->priv->groups);
  g_hash_table_remove_all (sl->priv->iters);
  gtk_list_store_clear (sl->priv->model);
-  
+
  if (GTK_IS_APPLICATION (object))
    add_group (sl, page, G_ACTION_GROUP (object), "app");
-  else if (GTK_IS_APPLICATION_WINDOW (object))
-    add_group (sl, page, G_ACTION_GROUP (object), "win");
  else if (GTK_IS_WIDGET (object))
    {
      const gchar **prefixes;
@@ -47,9 +47,6 @@ struct _GtkInspectorMiscInfoPrivate {
  GtkWidget *state;
  GtkWidget *buildable_id_row;
  GtkWidget *buildable_id;
-  GtkWidget *default_widget_row;
-  GtkWidget *default_widget;
-  GtkWidget *default_widget_button;
  GtkWidget *mnemonic_label_row;
  GtkWidget *mnemonic_label;
  GtkWidget *request_mode_row;
@@ -186,38 +183,6 @@ show_object (GtkInspectorMiscInfo *sl,
  gtk_inspector_object_tree_select_object (sl->priv->object_tree, object);
 }

-static void
-update_default_widget (GtkInspectorMiscInfo *sl)
-{
-  GtkWidget *widget;
-
-  widget = gtk_window_get_default_widget (GTK_WINDOW (sl->priv->object));
-  if (widget)
-    {
-      gchar *tmp;
-      tmp = g_strdup_printf ("%p", widget);
-      gtk_label_set_label (GTK_LABEL (sl->priv->default_widget), tmp);
-      g_free (tmp);
-      gtk_widget_set_sensitive (sl->priv->default_widget_button, TRUE);
-    }
-  else
-    {
-      gtk_label_set_label (GTK_LABEL (sl->priv->default_widget), "NULL");   
-      gtk_widget_set_sensitive (sl->priv->default_widget_button, FALSE);
-    }
-}
-
-static void
-show_default_widget (GtkWidget *button, GtkInspectorMiscInfo *sl)
-{
-  GtkWidget *widget;
-
-  update_default_widget (sl);
-  widget = gtk_window_get_default_widget (GTK_WINDOW (sl->priv->object));
-  if (widget)
-    show_object (sl, G_OBJECT (widget), "properties"); 
-}
-
 static void
 show_mnemonic_label (GtkWidget *button, GtkInspectorMiscInfo *sl)
 {
@@ -326,11 +291,6 @@ update_info (gpointer data)
                          gtk_buildable_get_name (GTK_BUILDABLE (sl->priv->object)));
    }

-  if (GTK_IS_WINDOW (sl->priv->object))
-    {
-      update_default_widget (sl);
-    }
-
  if (GDK_IS_FRAME_CLOCK (sl->priv->object))
    {
      GdkFrameClock *clock;
@@ -441,15 +401,6 @@ gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl,
      gtk_widget_hide (sl->priv->buildable_id_row);
    }

-  if (GTK_IS_WINDOW (object))
-    {
-      gtk_widget_show (sl->priv->default_widget_row);
-    }
-  else
-    {
-      gtk_widget_hide (sl->priv->default_widget_row);
-    }
-
  if (GDK_IS_FRAME_CLOCK (object))
    {
      gtk_widget_show (sl->priv->framecount_row);
@@ -563,9 +514,6 @@ gtk_inspector_misc_info_class_init (GtkInspectorMiscInfoClass *klass)
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, state);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, buildable_id_row);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, buildable_id);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, default_widget_row);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, default_widget);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, default_widget_button);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, mnemonic_label_row);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, mnemonic_label);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, request_mode_row);
@@ -598,7 +546,6 @@ gtk_inspector_misc_info_class_init (GtkInspectorMiscInfoClass *klass)
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, child_visible_row);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, child_visible);

-  gtk_widget_class_bind_template_callback (widget_class, show_default_widget);
  gtk_widget_class_bind_template_callback (widget_class, show_frame_clock);
 }

@@ -148,41 +148,6 @@
                    </child>
                  </object>
                </child>
-                <child>
-                  <object class="GtkListBoxRow" id="default_widget_row">
-                    <property name="activatable">0</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="margin">10</property>
-                        <property name="spacing">40</property>
-                        <child>
-                          <object class="GtkLabel" id="default_widget_label">
-                            <property name="label" translatable="yes">Default Widget</property>
-                            <property name="halign">start</property>
-                            <property name="valign">baseline</property>
-                            <property name="xalign">0.0</property>
-                            <property name="hexpand">1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="default_widget">
-                            <property name="selectable">1</property>
-                            <property name="halign">end</property>
-                            <property name="valign">baseline</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="default_widget_button">
-                            <property name="halign">end</property>
-                            <property name="valign">baseline</property>
-                            <property name="label" translatable="yes">Properties</property>
-                            <signal name="clicked" handler="show_default_widget"/>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                <child>
                  <object class="GtkListBoxRow" id="mnemonic_label_row">
                    <property name="activatable">0</property>
@@ -605,7 +570,6 @@
      <widget name="refcount_label"/>
      <widget name="state_label"/>
      <widget name="buildable_id_label"/>
-      <widget name="default_widget_label"/>
      <widget name="frame_clock_label"/>
    </widgets>
  </object>
@@ -819,7 +819,7 @@ property_editor (GObject                *object,

      prop_edit = gtk_spin_button_new (adj, 1.0, 0);

-      g_object_connect_property (object, spec, G_CALLBACK (int_changed), adj, G_OBJECT (adj)); 
+      g_object_connect_property (object, spec, G_CALLBACK (int_changed), adj, G_OBJECT (adj));

      connect_controller (G_OBJECT (adj), "value_changed",
                          object, spec, G_CALLBACK (int_modified));
@@ -1519,6 +1519,25 @@ add_gtk_settings_info (GtkInspectorPropEditor *editor)
  gtk_container_add (GTK_CONTAINER (editor), row);
 }

+static void
+readonly_changed (GObject    *object,
+                  GParamSpec *spec,
+                  gpointer    data)
+{
+  GValue gvalue = {0};
+  gchar *value;
+  gchar *type;
+
+  g_value_init (&gvalue, spec->value_type);
+  g_object_get_property (object, spec->name, &gvalue);
+  strdup_value_contents (&gvalue, &value, &type);
+
+  gtk_label_set_label (GTK_LABEL (data), value);
+
+  g_free (value);
+  g_free (type);
+}
+
 static void
 constructed (GObject *object)
 {
@@ -1557,20 +1576,14 @@ constructed (GObject *object)

  if (!can_modify)
    {
-      GValue gvalue = {0};
-      gchar *value;
-      gchar *type;
-
-      g_value_init (&gvalue, spec->value_type);
-      g_object_get_property (editor->priv->object, spec->name, &gvalue);
-      strdup_value_contents (&gvalue, &value, &type);
-
-      label = gtk_label_new (value);
+      label = gtk_label_new ("");
      gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL);
      gtk_container_add (GTK_CONTAINER (box), label);

-      g_free (value);
-      g_free (type);
+      readonly_changed (editor->priv->object, spec, label);
+      g_object_connect_property (editor->priv->object, spec,
+                                 G_CALLBACK (readonly_changed),
+                                 label, G_OBJECT (label));

      if (editor->priv->size_group)
        gtk_size_group_add_widget (editor->priv->size_group, box);
@@ -42,6 +42,7 @@
 #include "gtklistbox.h"
 #include "gtksizegroup.h"
 #include "gtkroot.h"
+#include "gtkgesturemultipress.h"

 enum
 {
@@ -50,6 +51,11 @@ enum
  PROP_SEARCH_ENTRY
 };

+typedef enum {
+  COLUMN_NAME,
+  COLUMN_ORIGIN
+} SortColumn;
+
 struct _GtkInspectorPropListPrivate
 {
  GObject *object;
@@ -58,6 +64,12 @@ struct _GtkInspectorPropListPrivate
  GtkWidget *search_entry;
  GtkWidget *search_stack;
  GtkWidget *list2;
+  GtkWidget *name_sort_indicator;
+  GtkWidget *origin_sort_indicator;
+  GtkWidget *name_heading;
+  GtkWidget *origin_heading;
+  SortColumn sort_column;
+  GtkSortType sort_direction;
  GtkSizeGroup *names;
  GtkSizeGroup *types;
  GtkSizeGroup *values;
@@ -81,6 +93,90 @@ show_search_entry (GtkInspectorPropList *pl)
                               pl->priv->search_entry);
 }

+static void
+apply_sort (GtkInspectorPropList *pl,
+            SortColumn            column,
+            GtkSortType           direction)
+{
+  const char *icon_name;
+
+  icon_name = direction == GTK_SORT_ASCENDING ? "pan-down-symbolic"
+                                              : "pan-up-symbolic";
+
+  if (column == COLUMN_NAME)
+    {
+      gtk_widget_hide (pl->priv->origin_sort_indicator);
+      gtk_widget_show (pl->priv->name_sort_indicator);
+
+      gtk_image_set_from_icon_name (GTK_IMAGE (pl->priv->name_sort_indicator),
+                                    icon_name);
+    }
+  else
+    {
+      gtk_widget_show (pl->priv->origin_sort_indicator);
+      gtk_widget_hide (pl->priv->name_sort_indicator);
+
+      gtk_image_set_from_icon_name (GTK_IMAGE (pl->priv->origin_sort_indicator),
+                                    icon_name);
+    }
+
+  pl->priv->sort_column = column;
+  pl->priv->sort_direction = direction;
+
+  gtk_list_box_invalidate_sort (GTK_LIST_BOX (pl->priv->list2));
+}
+
+static void
+sort_changed (GtkGestureMultiPress *gesture,
+              int                   n_press,
+              double                x,
+              double                y,
+              GtkInspectorPropList *pl)
+{
+  SortColumn column;
+  GtkSortType direction;
+  GtkWidget *widget;
+
+  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
+  if (widget == pl->priv->name_heading)
+    column = COLUMN_NAME;
+  else
+    column = COLUMN_ORIGIN;
+
+  if (pl->priv->sort_column == column &&
+      pl->priv->sort_direction == GTK_SORT_ASCENDING)
+    direction = GTK_SORT_DESCENDING;
+  else
+    direction = GTK_SORT_ASCENDING;
+
+  apply_sort (pl, column, direction);
+}
+
+static const char *
+row_get_column (GtkListBoxRow *row,
+                SortColumn     column)
+{
+  GParamSpec *prop = g_object_get_data (G_OBJECT (row), "pspec");
+
+  if (column == COLUMN_NAME)
+    return prop->name;
+  else
+    return g_type_name (prop->owner_type);
+}
+
+static int
+sort_func (GtkListBoxRow *row1,
+           GtkListBoxRow *row2,
+           gpointer       user_data)
+{
+  GtkInspectorPropList *pl = user_data;
+  const char *s1 = row_get_column (row1, pl->priv->sort_column);
+  const char *s2 = row_get_column (row2, pl->priv->sort_column);
+  int ret = strcmp (s1, s2);
+
+  return pl->priv->sort_direction == GTK_SORT_ASCENDING ? ret : -ret;
+}
+
 static gboolean
 filter_func (GtkListBoxRow *row,
             gpointer       data)
@@ -97,6 +193,7 @@ gtk_inspector_prop_list_init (GtkInspectorPropList *pl)
 {
  pl->priv = gtk_inspector_prop_list_get_instance_private (pl);
  gtk_widget_init_template (GTK_WIDGET (pl));
+  apply_sort (pl, COLUMN_NAME, GTK_SORT_ASCENDING);
 }

 static void
@@ -154,11 +251,6 @@ show_object (GtkInspectorPropEditor *editor,
             const gchar            *tab,
             GtkInspectorPropList   *pl)
 {
-  GtkWidget *popover;
-
-  popover = gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_POPOVER);
-  gtk_widget_hide (popover);
-
  g_object_set_data_full (G_OBJECT (pl->priv->object_tree), "next-tab", g_strdup (tab), g_free);
  gtk_inspector_object_tree_select_object (pl->priv->object_tree, object);
  gtk_inspector_object_tree_activate_object (pl->priv->object_tree, object);
@@ -197,6 +289,7 @@ constructed (GObject *object)
                            G_CALLBACK (gtk_list_box_invalidate_filter), pl->priv->list2);

  gtk_list_box_set_filter_func (GTK_LIST_BOX (pl->priv->list2), filter_func, pl, NULL);
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (pl->priv->list2), sort_func, pl, NULL);
 }

 static void
@@ -289,6 +382,11 @@ gtk_inspector_prop_list_class_init (GtkInspectorPropListClass *klass)
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, types);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, values);
  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, origins);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, name_heading);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, name_sort_indicator);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, origin_heading);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, origin_sort_indicator);
+  gtk_widget_class_bind_template_callback (widget_class, sort_changed);
 }

 /* Like g_strdup_value_contents, but keeps the type name separate */
@@ -471,21 +569,6 @@ gtk_inspector_prop_list_create_row (GtkInspectorPropList *pl,
  return row;
 }

-static void
-gtk_inspector_prop_list_prop_changed_cb (GObject              *pspec,
-                                         GParamSpec           *prop,
-                                         GtkInspectorPropList *pl)
-{
-  if (!pl->priv->object)
-    return;
-
-#if 0
-  iter = g_hash_table_lookup (pl->priv->prop_iters, prop->name);
-  if (iter != NULL)
-    gtk_inspector_prop_list_update_prop (pl, iter, prop);
-#endif
-}
-
 static void
 cleanup_object (GtkInspectorPropList *pl)
 {
@@ -533,7 +616,7 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
        continue;

      row = gtk_inspector_prop_list_create_row (pl, prop);
-      gtk_container_add (GTK_CONTAINER (pl->priv->list2), row);      
+      gtk_container_add (GTK_CONTAINER (pl->priv->list2), row);
    }

  g_free (props);
@@ -541,11 +624,6 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
  if (GTK_IS_WIDGET (object))
    g_signal_connect_object (object, "destroy", G_CALLBACK (cleanup_object), pl, G_CONNECT_SWAPPED);

-  /* Listen for updates */
-  pl->priv->notify_handler_id =
-      g_signal_connect_object (object, "notify",
-                               G_CALLBACK (gtk_inspector_prop_list_prop_changed_cb), pl, 0);
-
  gtk_widget_show (GTK_WIDGET (pl));

  return TRUE;
@@ -14,9 +14,24 @@
              <class name="header"/>
            </style>
            <child>
-              <object class="GtkLabel" id="name_heading">
-                <property name="label">Name</property>
-                <property name="xalign">0</property>
+              <object class="GtkBox" id="name_heading">
+                <child>
+                  <object class="GtkGestureMultiPress">
+                    <signal name="pressed" handler="sort_changed" swapped="no"/>
+
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label">Name</property>
+                    <property name="xalign">0</property>
+                    <property name="hexpand">1</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImage" id="name_sort_indicator">
+                  </object>
+                </child>
              </object>
            </child>
            <child>
@@ -26,9 +41,24 @@
              </object>
            </child>
            <child>
-              <object class="GtkLabel" id="origin_heading">
-                <property name="label">Defined at</property>
-                <property name="xalign">0</property>
+              <object class="GtkBox" id="origin_heading">
+                <child>
+                  <object class="GtkGestureMultiPress">
+                    <signal name="pressed" handler="sort_changed" swapped="no"/>
+
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label">Defined at</property>
+                    <property name="xalign">0</property>
+                    <property name="hexpand">1</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImage" id="origin_sort_indicator">
+                  </object>
+                </child>
              </object>
            </child>
            <child>
@@ -128,7 +128,7 @@
      </description>
    </key>
    <key name='sidebar-width' type='i'>
-      <default>148</default>
+      <default>-1</default>
      <summary>Sidebar width</summary>
      <description>
 	Width in pixels of the file chooser's places sidebar.
@@ -16,6 +16,7 @@ $window_radius: $button_radius + 3;
  -gtk-secondary-caret-color: $selected_bg_color
 }

+modelbutton:focus(visible),
 button:focus(visible),
 checkbutton:focus(visible),
 radiobutton:focus(visible),
@@ -356,7 +357,7 @@ entry {
      }
    }

-    image { // entry icons colors
+    > image { // entry icons colors
      color: mix($fg_color, $base_color, 80%);

      &:hover { color: $fg_color; }
@@ -3875,6 +3876,10 @@ filechooser {
  #pathbarbox { border-bottom: 1px solid $bg_color; }
 }

+
+filechooserbutton>button>box {
+  border-spacing: 6px;
+}
 filechooserbutton:drop(active) {
  box-shadow: none;
  border-color: transparent;
@@ -4054,10 +4059,8 @@ placesview {

  row.activatable:hover { background-color: transparent; }

-  // this selects the "connect to server" label
-  > actionbar > revealer > box > label {
-    padding-left: 8px;
-    padding-right: 8px;
+  > actionbar > revealer > box  > box{
+    border-spacing: 6px;
  }
 }

@@ -4339,7 +4342,7 @@ colorswatch {
  }

  &#add-color-button {
-    border-radius: $_colorswatch_radius $_colorswatch_radius 0 0;
+    border-radius: $_colorswatch_radius 0 0 $_colorswatch_radius;

    &:only-child { border-radius: $_colorswatch_radius; }

@@ -4624,10 +4627,10 @@ stackswitcher button.text-button.circular { // FIXME aggregate with buttons
 *************/
 /* Outline for low res icons */
 .lowres-icon {
-gtk-icon-shadow: 1px 1px rgba(0,0,0,0.3),
-             -1px -1px rgba(0,0,0,0.3),
-             -1px 1px rgba(0,0,0,0.3),
-             1px -1px rgba(0,0,0,0.3);
+    -gtk-icon-shadow: 0 -1px rgba(0,0,0,0.05),
+      1px 0 rgba(0,0,0,0.1),
+      0 1px rgba(0,0,0,0.3),
+      -1px 0 rgba(0,0,0,0.1);
 }

 /* Drapshadow for large icons */
@@ -1,6 +1,6 @@
 * { padding: 0; -gtk-secondary-caret-color: #15539e; }

-button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }
+modelbutton:focus(visible), button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }

 /*************** Base States * */
 .background { color: #eeeeec; background-color: #353535; }
@@ -137,13 +137,13 @@ spinbutton.warning:focus:not(.vertical), spinbutton.vertical text.warning:focus,

 spinbutton.warning:not(.vertical) selection, spinbutton.vertical text.warning selection, entry.warning selection { background-color: #f57900; }

-spinbutton:not(.vertical) image, spinbutton.vertical text image, entry image { color: #c7c7c6; }
+spinbutton:not(.vertical) > image, spinbutton.vertical text > image, entry > image { color: #c7c7c6; }

-spinbutton:not(.vertical) image:hover, spinbutton.vertical text image:hover, entry image:hover { color: #eeeeec; }
+spinbutton:not(.vertical) > image:hover, spinbutton.vertical text > image:hover, entry > image:hover { color: #eeeeec; }

-spinbutton:not(.vertical) image:active, spinbutton.vertical text image:active, entry image:active { color: #15539e; }
+spinbutton:not(.vertical) > image:active, spinbutton.vertical text > image:active, entry > image:active { color: #15539e; }

-spinbutton:not(.vertical) image:backdrop, spinbutton.vertical text image:backdrop, entry image:backdrop { color: #7e7e7d; }
+spinbutton:not(.vertical) > image:backdrop, spinbutton.vertical text > image:backdrop, entry > image:backdrop { color: #7e7e7d; }

 spinbutton.password:not(.vertical) image.caps-lock-indicator, spinbutton.vertical text.password image.caps-lock-indicator, entry.password image.caps-lock-indicator { color: #7e7e7d; }

@@ -1695,6 +1695,8 @@ filechooser .dialog-action-box:backdrop { border-top-color: #202020; }

 filechooser #pathbarbox { border-bottom: 1px solid #353535; }

+filechooserbutton > button > box { border-spacing: 6px; }
+
 filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }

 /*********** Sidebar * */
@@ -1769,7 +1771,7 @@ placesview .server-list-button:checked > image { transition: 200ms cubic-bezier(

 placesview row.activatable:hover { background-color: transparent; }

-placesview > actionbar > revealer > box > label { padding-left: 8px; padding-right: 8px; }
+placesview > actionbar > revealer > box > box { border-spacing: 6px; }

 /********* Paned * */
 paned > separator { min-width: 1px; min-height: 1px; -gtk-icon-source: none; border-style: none; background-color: transparent; background-image: image(#1b1b1b); background-size: 1px 1px; }
@@ -2001,7 +2003,7 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w

 /************* App Icons * */
 /* Outline for low res icons */
-.lowres-icon { -gtk-icon-shadow: 1px 1px rgba(0, 0, 0, 0.3), -1px -1px rgba(0, 0, 0, 0.3), -1px 1px rgba(0, 0, 0, 0.3), 1px -1px rgba(0, 0, 0, 0.3); }
+.lowres-icon { -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.05), 1px 0 rgba(0, 0, 0, 0.1), 0 1px rgba(0, 0, 0, 0.3), -1px 0 rgba(0, 0, 0, 0.1); }

 /* Drapshadow for large icons */
 .icon-dropshadow { -gtk-icon-shadow: 0 2px 12px rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.7); }
@@ -1,6 +1,6 @@
 * { padding: 0; -gtk-secondary-caret-color: #3584e4; }

-button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }
+modelbutton:focus(visible), button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 3px; }

 /*************** Base States * */
 .background { color: #2e3436; background-color: #f6f5f4; }
@@ -137,13 +137,13 @@ spinbutton.warning:focus:not(.vertical), spinbutton.vertical text.warning:focus,

 spinbutton.warning:not(.vertical) selection, spinbutton.vertical text.warning selection, entry.warning selection { background-color: #f57900; }

-spinbutton:not(.vertical) image, spinbutton.vertical text image, entry image { color: #585d5e; }
+spinbutton:not(.vertical) > image, spinbutton.vertical text > image, entry > image { color: #585d5e; }

-spinbutton:not(.vertical) image:hover, spinbutton.vertical text image:hover, entry image:hover { color: #2e3436; }
+spinbutton:not(.vertical) > image:hover, spinbutton.vertical text > image:hover, entry > image:hover { color: #2e3436; }

-spinbutton:not(.vertical) image:active, spinbutton.vertical text image:active, entry image:active { color: #3584e4; }
+spinbutton:not(.vertical) > image:active, spinbutton.vertical text > image:active, entry > image:active { color: #3584e4; }

-spinbutton:not(.vertical) image:backdrop, spinbutton.vertical text image:backdrop, entry image:backdrop { color: #a7aaaa; }
+spinbutton:not(.vertical) > image:backdrop, spinbutton.vertical text > image:backdrop, entry > image:backdrop { color: #a7aaaa; }

 spinbutton.password:not(.vertical) image.caps-lock-indicator, spinbutton.vertical text.password image.caps-lock-indicator, entry.password image.caps-lock-indicator { color: #a7aaaa; }

@@ -1711,6 +1711,8 @@ filechooser .dialog-action-box:backdrop { border-top-color: #d5d0cc; }

 filechooser #pathbarbox { border-bottom: 1px solid #f6f5f4; }

+filechooserbutton > button > box { border-spacing: 6px; }
+
 filechooserbutton:drop(active) { box-shadow: none; border-color: transparent; }

 /*********** Sidebar * */
@@ -1785,7 +1787,7 @@ placesview .server-list-button:checked > image { transition: 200ms cubic-bezier(

 placesview row.activatable:hover { background-color: transparent; }

-placesview > actionbar > revealer > box > label { padding-left: 8px; padding-right: 8px; }
+placesview > actionbar > revealer > box > box { border-spacing: 6px; }

 /********* Paned * */
 paned > separator { min-width: 1px; min-height: 1px; -gtk-icon-source: none; border-style: none; background-color: transparent; background-image: image(#cdc7c2); background-size: 1px 1px; }
@@ -2017,7 +2019,7 @@ stackswitcher button.circular, stackswitcher button.text-button.circular { min-w

 /************* App Icons * */
 /* Outline for low res icons */
-.lowres-icon { -gtk-icon-shadow: 1px 1px rgba(0, 0, 0, 0.3), -1px -1px rgba(0, 0, 0, 0.3), -1px 1px rgba(0, 0, 0, 0.3), 1px -1px rgba(0, 0, 0, 0.3); }
+.lowres-icon { -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.05), 1px 0 rgba(0, 0, 0, 0.1), 0 1px rgba(0, 0, 0, 0.3), -1px 0 rgba(0, 0, 0, 0.1); }

 /* Drapshadow for large icons */
 .icon-dropshadow { -gtk-icon-shadow: 0 2px 12px rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.7); }
@@ -50,7 +50,6 @@
      <object class="GtkButton" id="ok_button">
        <property name="label" translatable="yes">_Select</property>
        <property name="use-underline">1</property>
-        <property name="can-default">1</property>
      </object>
    </child>
    <action-widgets>
@@ -36,7 +36,6 @@
                    <property name="visible">0</property>
                    <property name="label" translatable="yes">_Close</property>
                    <property name="can-focus">1</property>
-                    <property name="can-default">1</property>
                    <property name="receives-default">1</property>
                    <property name="use-underline">1</property>
                    <style>
@@ -87,7 +86,6 @@
                  <object class="GtkButton" id="forward">
                    <property name="label" translatable="yes">_Next</property>
                    <property name="can-focus">1</property>
-                    <property name="can-default">1</property>
                    <property name="receives-default">1</property>
                    <property name="use-underline">1</property>
                    <style>
@@ -101,7 +99,6 @@
                    <property name="visible">0</property>
                    <property name="label" translatable="yes">_Apply</property>
                    <property name="can-focus">1</property>
-                    <property name="can-default">1</property>
                    <property name="receives-default">1</property>
                    <property name="use-underline">1</property>
                    <style>
@@ -32,7 +32,6 @@
      <object class="GtkButton" id="ok_button">
        <property name="label" translatable="yes">_Select</property>
        <property name="use-underline">1</property>
-        <property name="can-default">1</property>
      </object>
    </child>
    <action-widgets>
@@ -85,10 +85,9 @@
                                  <object class="GtkStackPage">
                                    <property name="name">search</property>
                                    <property name="child">
-                                      <object class="GtkBox" id="search_entry_box">
-                                        <property name="spacing">6</property>
+                                      <object class="GtkCenterBox" id="search_entry_box">
                                        <property name="margin">6</property>
-                                        <child>
+                                        <child type="center">
                                          <object class="GtkSearchEntry" id="search_entry">
                                            <property name="width-chars">45</property>
                                            <property name="hexpand">1</property>
@@ -97,7 +96,7 @@
                                            <signal name="stop-search" handler="search_entry_stop_cb" swapped="yes"/>
                                          </object>
                                        </child>
-                                        <child>
+                                        <child type="end">
                                          <object class="GtkSpinner" id="search_spinner">
                                            <property name="visible">0</property>
                                          </object>
@@ -168,6 +167,7 @@
                                            <signal name="query-tooltip" handler="file_list_query_tooltip_cb" swapped="no"/>
                                            <signal name="row-activated" handler="list_row_activated" swapped="no"/>
                                            <signal name="cursor-changed" handler="list_cursor_changed" swapped="no"/>
+                                            <signal name="keynav-failed" handler="browse_files_tree_view_keynav_failed_cb" />
                                            <child internal-child="selection">
                                              <object class="GtkTreeSelection" id="treeview-selection2">
                                                <signal name="changed" handler="list_selection_changed" swapped="no"/>
@@ -412,7 +412,6 @@
            <property name="sensitive">0</property>
            <property name="label" translatable="yes">_Create</property>
            <property name="use-underline">1</property>
-            <property name="can-default">1</property>
            <signal name="clicked" handler="new_folder_create_clicked"/>
            <style>
              <class name="suggested-action"/>
@@ -459,6 +458,7 @@
        <child>
          <object class="GtkEntry" id="rename_file_name_entry">
            <property name="activates-default">1</property>
+            <property name="hexpand">1</property>
            <signal name="changed" handler="rename_file_name_changed"/>
            <layout>
              <property name="left-attach">0</property>
@@ -471,7 +471,6 @@
            <property name="sensitive">0</property>
            <property name="label" translatable="yes">_Rename</property>
            <property name="use-underline">1</property>
-            <property name="can-default">1</property>
            <signal name="clicked" handler="rename_file_rename_clicked"/>
            <style>
              <class name="suggested-action"/>
@@ -26,7 +26,6 @@
      <object class="GtkButton" id="select_button">
        <property name="label" translatable="yes">_Select</property>
        <property name="use-underline">1</property>
-        <property name="can-default">1</property>
      </object>
    </child>
    <child>
@@ -35,7 +35,7 @@ gdk_pixbuf_req     = '>= 2.30.0'
 introspection_req  = '>= 1.39.0'
 wayland_proto_req  = '>= 1.12'
 wayland_req        = '>= 1.14.91'
-graphene_req       = '>= 1.8.7'
+graphene_req       = '>= 1.9.1'
 epoxy_req          = '>= 1.4'
 cloudproviders_req = '>= 0.2.5'
 xkbcommon_req      = '>= 0.2.0'
@@ -44,7 +44,6 @@
          <object class="GtkButton" id="confirm_button">
            <property name="label" translatable="yes">_Join</property>
            <property name="can_focus">1</property>
-            <property name="can_default">1</property>
            <property name="has_default">1</property>
            <property name="receives_default">1</property>
            <property name="use_underline">1</property>
--- a/Show More
+++ b/Show More