wip: static values

Determine whether a css value is 'static' at creation
time. Static values don't need to have compute() called,
since their value is always the same, so we can just
ref them.

.gitlab-ci.yml

@@ -13,7 +13,7 @@ stages:
     - subprojects/pango/
 
 fedora-x86_64: &fedora-x86_64-defaults
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v9
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v8
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -29,7 +29,6 @@ fedora-x86_64: &fedora-x86_64-defaults
       - "${CI_PROJECT_DIR}/_build/report.html"
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
       - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
   cache:
     key: "$CI_JOB_NAME"
     <<: *cache-paths

.gitlab-ci/Dockerfile

@@ -67,7 +67,6 @@ RUN dnf -y install \
     python3-wheel \
     redhat-rpm-config \
     sassc \
-    sysprof-devel \
     systemtap-sdt-devel \
     vulkan-devel \
     wayland-devel \

.gitlab-ci/test-docker.sh

@@ -16,7 +16,6 @@ meson \
         -Dwayland-backend=true \
         -Dbroadway-backend=true \
         -Dvulkan=yes \
-        -Dprofiler=true \
         --werror \
         ${EXTRA_MESON_FLAGS:-} \
         _build $srcdir

demos/gtk-demo/clipboard.c

@@ -119,76 +119,48 @@ get_image_paintable (GtkImage *image)
 }
 
 static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag,
-            GtkWidget     *widget)
+drag_begin (GtkWidget      *widget,
+            GdkDrag        *drag,
+            gpointer        data)
 {
   GdkPaintable *paintable;
 
   paintable = get_image_paintable (GTK_IMAGE (widget));
   if (paintable)
     {
-      gtk_drag_source_set_icon (source, paintable, -2, -2);
+      gtk_drag_set_icon_paintable (drag, paintable, -2, -2);
       g_object_unref (paintable);
     }
 }
 
-static void
-get_texture (GValue   *value,
-             gpointer  data)
+void
+drag_data_get (GtkWidget        *widget,
+               GdkDrag          *drag,
+               GtkSelectionData *selection_data,
+               guint             info,
+               gpointer          data)
 {
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
+  GdkPaintable *paintable;
 
+  paintable = get_image_paintable (GTK_IMAGE (widget));
   if (GDK_IS_TEXTURE (paintable))
-    g_value_set_object (value, paintable);
-}
-
-static GdkContentProvider *
-prepare_drag (GtkDragSource *source,
-              double         x,
-              double         y,
-              GtkWidget     *image)
-{
-  return gdk_content_provider_new_with_callback (GDK_TYPE_TEXTURE, get_texture, image);
+    gtk_selection_data_set_texture (selection_data, GDK_TEXTURE (paintable));
 }
 
 static void
-got_texture (GObject *source,
-             GAsyncResult *result,
-             gpointer data)
+drag_data_received (GtkWidget        *widget,
+                    GdkDrop          *drop,
+                    GtkSelectionData *selection_data,
+                    gpointer          data)
 {
-  GdkDrop *drop = GDK_DROP (source);
-  GtkWidget *image = data;
-  const GValue *value;
-  GError *error = NULL;
-
-  value = gdk_drop_read_value_finish (drop, result, &error);
-  if (value)
+  if (gtk_selection_data_get_length (selection_data) > 0)
     {
-      GdkTexture *texture = g_value_get_object (value);
-      gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (texture));
-    }
-  else
-    {
-      g_print ("Failed to get data: %s\n", error->message);
-      g_error_free (error);
-    }
-}
+      GdkTexture *texture;
 
-static gboolean
-drag_drop (GtkDropTarget *dest,
-           GdkDrop       *drop,
-           int            x,
-           int            y,
-           GtkWidget     *widget)
-{
-  if (gdk_drop_has_value (drop, GDK_TYPE_TEXTURE))
-    {
-      gdk_drop_read_value_async (drop, GDK_TYPE_TEXTURE, G_PRIORITY_DEFAULT, NULL, got_texture, widget);
-      return TRUE;
+      texture = gtk_selection_data_get_texture (selection_data);
+      gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
+      g_object_unref (texture);
     }
-
-  return FALSE;
 }
 
 static void
@@ -199,8 +171,12 @@ copy_image (GSimpleAction *action,
   GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
   GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
 
+  g_print ("copy image\n");
   if (GDK_IS_TEXTURE (paintable))
-    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
+    {
+g_print ("set clipboard\n");
+      gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
+    }
 
   if (paintable)
     g_object_unref (paintable);
@@ -271,9 +247,6 @@ do_clipboard (GtkWidget *do_widget)
         { "paste", paste_image, NULL, NULL, NULL },
       };
       GActionGroup *actions;
-      GtkDragSource *source;
-      GtkDropTarget *dest;
-      GdkContentFormats *formats;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_display (GTK_WINDOW (window),
@@ -332,21 +305,22 @@ do_clipboard (GtkWidget *do_widget)
 
       /* Create the first image */
       image = gtk_image_new_from_icon_name ("dialog-warning");
-      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
       gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* make image a drag source */
-      source = gtk_drag_source_new ();
-      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
-      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (image);
+      g_signal_connect (image, "drag-begin",
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (image, "drag-data-get",
+                        G_CALLBACK (drag_data_get), image);
 
       /* accept drops on image */
-      formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE);
-      dest = gtk_drop_target_new (formats, GDK_ACTION_COPY);
-      gdk_content_formats_unref (formats);
-      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
+      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
+                         NULL, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (image);
+      g_signal_connect (image, "drag-data-received",
+                        G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
       gesture = gtk_gesture_click_new ();
@@ -363,21 +337,22 @@ do_clipboard (GtkWidget *do_widget)
 
       /* Create the second image */
       image = gtk_image_new_from_icon_name ("process-stop");
-      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
       gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* make image a drag source */
-      source = gtk_drag_source_new ();
-      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
-      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (image);
+      g_signal_connect (image, "drag-begin",
+                        G_CALLBACK (drag_begin), image);
+      g_signal_connect (image, "drag-data-get",
+                        G_CALLBACK (drag_data_get), image);
 
       /* accept drops on image */
-      formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE);
-      dest = gtk_drop_target_new (formats, GDK_ACTION_COPY);
-      gdk_content_formats_unref (formats);
-      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
+      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
+                         NULL, GDK_ACTION_COPY);
+      gtk_drag_dest_add_image_targets (image);
+      g_signal_connect (image, "drag-data-received",
+                        G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
       gesture = gtk_gesture_click_new ();

demos/gtk-demo/foreigndrawing.c

@@ -262,7 +262,7 @@ draw_menu (GtkWidget *widget,
   gint toggle_x, toggle_y, toggle_width, toggle_height;
 
   /* This information is taken from the GtkMenu docs, see "CSS nodes" */
-  menu_context = get_style (NULL, "menu");
+  menu_context = get_style (gtk_widget_get_style_context(widget), "menu");
   hovermenuitem_context = get_style (menu_context, "menuitem:hover");
   hoveredarrowmenuitem_context = get_style (hovermenuitem_context, "arrow.right:dir(ltr)");
   menuitem_context = get_style (menu_context, "menuitem");

demos/gtk-demo/gestures.c

@@ -94,12 +94,9 @@ drawing_area_draw (GtkDrawingArea *area,
       cairo_pattern_t *pat;
       cairo_matrix_t matrix;
       gdouble angle, scale;
-      gdouble x_center, y_center;
-
-      gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center);
 
       cairo_get_matrix (cr, &matrix);
-      cairo_matrix_translate (&matrix, x_center, y_center);
+      cairo_matrix_translate (&matrix, width / 2, height / 2);
 
       cairo_save (cr);
 

demos/gtk-demo/infobar.c

@@ -97,7 +97,6 @@ do_infobar (GtkWidget *do_widget)
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
-      gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);
 
       button = gtk_toggle_button_new_with_label ("Question");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);

demos/icon-browser/iconbrowserwin.c

@@ -5,6 +5,9 @@
 #include <gtk/gtk.h>
 
 /* Drag 'n Drop */
+static const char *target_table[] = {
+  "text/uri-list"
+};
 
 typedef struct
 {
@@ -73,11 +76,30 @@ search_text_changed (GtkEntry *entry, IconBrowserWindow *win)
   gtk_tree_model_filter_refilter (win->filter_model);
 }
 
+static GdkPixbuf *
+get_icon (GtkWidget *image, const gchar *name, gint size)
+{
+  GtkIconInfo *info;
+  GtkStyleContext *context;
+  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
+
+  context = gtk_widget_get_style_context (image);
+  info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, size, 0);
+  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL));
+  pixbuf = gdk_pixbuf_get_from_texture (texture);
+  g_object_unref (texture);
+  g_object_unref (info);
+
+  return pixbuf;
+}
+
 static void
 set_image (GtkWidget *image, const gchar *name, gint size)
 {
   gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
   gtk_image_set_pixel_size (GTK_IMAGE (image), size);
+  gtk_drag_source_set_icon_name (image, name);
 }
 
 static void
@@ -343,107 +365,78 @@ search_mode_toggled (GObject *searchbar, GParamSpec *pspec, IconBrowserWindow *w
     gtk_list_box_unselect_all (GTK_LIST_BOX (win->context_list));
 }
 
-static GdkPaintable *
-get_image_paintable (GtkImage *image)
+static void
+get_image_data (GtkWidget        *widget,
+                GdkDrag          *drag,
+                GtkSelectionData *selection,
+                guint             target_info,
+                gpointer          data)
 {
-  const gchar *icon_name;
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  int size;
+  GtkWidget *image;
+  const gchar *name;
+  gint size;
+  GdkPixbuf *pixbuf;
 
-  switch (gtk_image_get_storage_type (image))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
-    case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (image);
-      size = gtk_image_get_pixel_size (image);
-      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
-                                              GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
-      if (icon_info == NULL)
-        return NULL;
-      return gtk_icon_info_load_icon (icon_info, NULL);
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (image));
-      return NULL;
-    }
+  image = gtk_bin_get_child (GTK_BIN (widget));
+
+  name = gtk_image_get_icon_name (GTK_IMAGE (image));
+  size = gtk_image_get_pixel_size (GTK_IMAGE (image));
+
+  pixbuf = get_icon (image, name, size);
+  gtk_selection_data_set_pixbuf (selection, pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag,
-            GtkWidget     *widget)
+get_scalable_image_data (GtkWidget        *widget,
+                         GdkDrag          *drag,
+                         GtkSelectionData *selection,
+                         guint             target_info,
+                         gpointer          data)
 {
-  GdkPaintable *paintable;
-
-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (paintable)
-    {
-      int w, h;
-
-      w = gdk_paintable_get_intrinsic_width (paintable);
-      h = gdk_paintable_get_intrinsic_height (paintable);
-      gtk_drag_source_set_icon (source, paintable, w, h);
-      g_object_unref (paintable);
-    }
-}
-
-static void
-get_texture (GValue   *value,
-             gpointer  data)
-{
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
-
-  if (GDK_IS_TEXTURE (paintable))
-    g_value_set_object (value, paintable);
-}
-
-static void
-get_file (GValue   *value,
-          gpointer  data)
-{
-  const char *name;
+  gchar *uris[2];
   GtkIconInfo *info;
+  GtkWidget *image;
   GFile *file;
+  const gchar *name;
 
-  name = gtk_image_get_icon_name (GTK_IMAGE (data));
+  image = gtk_bin_get_child (GTK_BIN (widget));
+  name = gtk_image_get_icon_name (GTK_IMAGE (image));
 
   info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, -1, 0);
   file = g_file_new_for_path (gtk_icon_info_get_filename (info));
-  g_value_set_object (value, file);
-  g_object_unref (file);
+  uris[0] = g_file_get_uri (file);
+  uris[1] = NULL;
+
+  gtk_selection_data_set_uris (selection, uris);
+
+  g_free (uris[0]);
   g_object_unref (info);
+  g_object_unref (file);
 }
 
 static void
 setup_image_dnd (GtkWidget *image)
 {
-  GdkContentProvider *content;
-  GtkDragSource *source;
-
-  source = gtk_drag_source_new ();
-  content = gdk_content_provider_new_with_callback (GDK_TYPE_TEXTURE, get_texture, image);
-  gtk_drag_source_set_content (source, content);
-  g_object_unref (content);
-  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-  gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+  gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, GDK_ACTION_COPY);
+  gtk_drag_source_add_image_targets (image);
+  g_signal_connect (image, "drag-data-get", G_CALLBACK (get_image_data), NULL);
 }
 
 static void
 setup_scalable_image_dnd (GtkWidget *image)
 {
-  GdkContentProvider *content;
-  GtkDragSource *source;
+  GtkWidget *parent;
+  GdkContentFormats *targets;
 
-  source = gtk_drag_source_new ();
-  content = gdk_content_provider_new_with_callback (G_TYPE_FILE, get_file, image);
-  gtk_drag_source_set_content (source, content);
-  g_object_unref (content);
+  parent = gtk_widget_get_parent (image);
+  targets = gdk_content_formats_new (target_table, G_N_ELEMENTS (target_table));
+  gtk_drag_source_set (parent, GDK_BUTTON1_MASK,
+                       targets,
+                       GDK_ACTION_COPY);
+  gdk_content_formats_unref (targets);
 
-  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-  gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+  g_signal_connect (parent, "drag-data-get", G_CALLBACK (get_scalable_image_data), NULL);
 }
 
 static void
@@ -453,7 +446,8 @@ icon_browser_window_init (IconBrowserWindow *win)
 
   gtk_widget_init_template (GTK_WIDGET (win));
 
-  list = gdk_content_formats_new_for_gtype (G_TYPE_STRING);
+  list = gdk_content_formats_new (NULL, 0);
+  list = gtk_content_formats_add_text_targets (list);
   gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (win->list),
                                           GDK_BUTTON1_MASK,
                                           list,
@@ -465,6 +459,7 @@ icon_browser_window_init (IconBrowserWindow *win)
   setup_image_dnd (win->image3);
   setup_image_dnd (win->image4);
   setup_image_dnd (win->image5);
+  setup_image_dnd (win->image6);
   setup_scalable_image_dnd (win->image6);
 
   win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, context_free);

demos/widget-factory/widget-factory.c

@@ -2000,13 +2000,6 @@ toggle_action (GSimpleAction *action,
                              g_variant_new_boolean (!g_variant_get_boolean (state)));
 }
 
-static gboolean
-quit_timeout (gpointer data)
-{
-  exit (0);
-  return G_SOURCE_REMOVE;
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -2072,9 +2065,6 @@ main (int argc, char *argv[])
 
   g_application_add_main_option (G_APPLICATION (app), "version", 0, 0, G_OPTION_ARG_NONE, "Show program version", NULL);
 
-  if (g_getenv ("GTK_DEBUG_AUTO_QUIT"))
-    g_timeout_add (500, quit_timeout, NULL);
-
   g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);

docs/reference/gsk/gsk4-sections.txt

@@ -183,7 +183,6 @@ gsk_transform_perspective
 gsk_transform_equal
 <SUBSECTION>
 gsk_transform_transform_bounds
-gsk_transform_transform_point
 <SUBSECTION Private>
 GSK_TYPE_TRANSFORM
 gsk_transform_get_type

docs/reference/gtk/gtk4-docs.xml

@@ -344,13 +344,6 @@
       <xi:include href="xml/gtkpadcontroller.xml" />
     </chapter>
 
-    <chapter>
-      <title>Data exchange, clipboards and Drag-and-Drop</title>
-      <xi:include href="xml/gtkdragsource.xml"/>
-      <xi:include href="xml/gtkdragicon.xml"/>
-      <xi:include href="xml/gtkdroptarget.xml"/>
-    </chapter>
-
   </part>
 
   <part  id="gtkbase">
@@ -359,6 +352,7 @@
     <xi:include href="xml/gtkfeatures.xml" />
     <xi:include href="xml/gtkaccelgroup.xml" />
     <xi:include href="xml/gtkaccelmap.xml" />
+    <xi:include href="xml/gtkdnd.xml" />
     <xi:include href="xml/gtksettings.xml" />
     <xi:include href="xml/gtkbindings.xml" />
     <xi:include href="xml/gtkenums.xml" />

docs/reference/gtk/gtk4-sections.txt

@@ -775,6 +775,7 @@ gtk_container_add
 gtk_container_remove
 gtk_container_foreach
 gtk_container_get_children
+gtk_container_get_path_for_child
 gtk_container_get_focus_vadjustment
 gtk_container_set_focus_vadjustment
 gtk_container_get_focus_hadjustment
@@ -4411,6 +4412,7 @@ gtk_widget_get_layout_manager
 gtk_widget_should_layout
 
 <SUBSECTION>
+gtk_widget_get_path
 gtk_widget_get_style_context
 gtk_widget_reset_style
 gtk_widget_class_get_css_name
@@ -4895,6 +4897,7 @@ gtk_border_free
 <SUBSECTION>
 gtk_render_arrow
 gtk_render_background
+gtk_render_background_get_clip
 gtk_render_check
 gtk_render_expander
 gtk_render_focus
@@ -4998,6 +5001,49 @@ GTK_TYPE_SELECTION_DATA
 gtk_selection_data_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkdnd</FILE>
+<TITLE>Drag and Drop</TITLE>
+GtkDestDefaults
+GtkDragResult
+
+<SUBSECTION Destination Side>
+gtk_drag_dest_set
+gtk_drag_dest_unset
+gtk_drag_dest_find_target
+gtk_drag_dest_get_target_list
+gtk_drag_dest_set_target_list
+gtk_drag_dest_add_text_targets
+gtk_drag_dest_add_image_targets
+gtk_drag_dest_add_uri_targets
+gtk_drag_dest_set_track_motion
+gtk_drag_dest_get_track_motion
+gtk_drag_get_data
+gtk_drag_get_source_widget
+gtk_drag_highlight
+gtk_drag_unhighlight
+
+<SUBSECTION Source Side>
+gtk_drag_begin
+gtk_drag_cancel
+gtk_drag_set_icon_widget
+gtk_drag_set_icon_paintable
+gtk_drag_set_icon_name
+gtk_drag_set_icon_gicon
+gtk_drag_set_icon_default
+gtk_drag_check_threshold
+gtk_drag_source_set
+gtk_drag_source_set_icon_name
+gtk_drag_source_set_icon_gicon
+gtk_drag_source_set_icon_paintable
+gtk_drag_source_unset
+gtk_drag_source_set_target_list
+gtk_drag_source_get_target_list
+gtk_drag_source_add_text_targets
+gtk_drag_source_add_image_targets
+gtk_drag_source_add_uri_targets
+</SECTION>
+
 <SECTION>
 <FILE>gtkbindings</FILE>
 <TITLE>Bindings</TITLE>
@@ -7145,69 +7191,3 @@ gtk_constraint_guide_get_max_size
 GTK_TYPE_CONSTRAINT_GUIDE
 gtk_constraint_guide_get_tyoe
 </SECTION>
-
-<SECTION>
-<FILE>gtkdragsource</FILE>
-GtkDragSource
-gtk_drag_source_new
-gtk_drag_source_set_content
-gtk_drag_source_get_content
-gtk_drag_source_set_actions
-gtk_drag_source_get_actions
-gtk_drag_source_set_icon
-gtk_drag_source_drag_cancel
-gtk_drag_source_get_drag
-gtk_drag_check_threshold
-<SUBSECTION Standard>
-GTK_TYPE_DRAG_SOURCE
-GTK_DRAG_SOURCE
-GTK_DRAG_SOURCE_CLASS
-GTK_IS_DRAG_SOURCE
-GTK_IS_DRAG_SOURCE_CLASS
-GTK_DRAG_SOURCE_GET_CLASS
-<SUBSECTION Private>
-gtk_drag_source_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkdroptarget</FILE>
-GtkDropTarget
-gtk_drop_target_new
-gtk_drop_target_set_formats
-gtk_drop_target_get_formats
-gtk_drop_target_set_actions
-gtk_drop_target_get_actions
-gtk_drop_target_get_drop
-gtk_drop_target_find_mimetype
-gtk_drop_target_read_selection
-gtk_drop_target_read_selection_finish
-gtk_drag_highlight
-gtk_drag_unhighlight
-
-<SUBSECTION Standard>
-GTK_TYPE_DROP_TARGET
-GTK_DROP_TARGET
-GTK_DROP_TARGET_CLASS
-GTK_IS_DROP_TARGET
-GTK_IS_DROP_TARGET_CLASS
-GTK_DROP_TARGET_GET_CLASS
-<SUBSECTION Private>
-gtk_drop_target_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkdragicon</FILE>
-GtkDragIcon
-gtk_drag_icon_new_for_drag
-gtk_drag_icon_set_from_paintable
-
-<SUBSECTION Standard>
-GTK_TYPE_DRAG_ICON
-GTK_DRAG_ICON
-GTK_DRAG_ICON_CLASS
-GTK_IS_DRAG_ICON
-GTK_IS_DRAG_ICON_CLASS
-GTK_DRAG_ICON_GET_CLASS
-<SUBSECTION Private>
-gtk_drag_icon_get_type
-</SECTION>

docs/reference/gtk/gtk4.types.in

@@ -57,10 +57,7 @@ gtk_constraint_target_get_type
 gtk_container_get_type
 gtk_css_provider_get_type
 gtk_dialog_get_type
-gtk_drag_icon_get_type
-gtk_drag_source_get_type
 gtk_drawing_area_get_type
-gtk_drop_target_get_type
 gtk_editable_get_type
 gtk_entry_buffer_get_type
 gtk_entry_completion_get_type

docs/reference/gtk/meson.build

@@ -48,6 +48,7 @@ private_headers = [
   'gtkcssfontfeaturesvalueprivate.h',
   'gtkcssfontvariationsvalueprivate.h',
   'gtkcssiconthemevalueprivate.h',
+  'gtkcssimagebuiltinprivate.h',
   'gtkcssimagecrossfadeprivate.h',
   'gtkcssimagefallbackprivate.h',
   'gtkcssimageiconthemeprivate.h',
@@ -96,6 +97,7 @@ private_headers = [
   'gtkcsswidgetnodeprivate.h',
   'gtkcsswin32sizevalueprivate.h',
   'gtkdialogprivate.h',
+  'gtkdndprivate.h',
   'gtkentryprivate.h',
   'gtkeventcontrollerlegacyprivate.h',
   'gtkeventcontrollerprivate.h',

docs/reference/gtk/migrating-3to4.xml

@@ -903,37 +903,6 @@
         gtk_tooltip_set_custom().
       </para>
     </section>
-
-    <section>
-      <title>Switch to the new DND api</title>
-      <para>
-        The source-side DND apis in GTK 4 have been changed to use an event controller, #GtkDragSource.
-      </para>
-      <para>
-        Instead of calling gtk_drag_source_set() and connecting to #GtkWidget signals, you create
-        a #GtkDragSource object, attach it to the widget with gtk_widget_add_controller(), and connect
-        to #GtkDragSource signals. Instead of calling gtk_drag_begin() on a widget to start a drag
-        manually, call gdk_drag_begin().
-      </para>
-      <para>
-        The ::drag-data-get signal has been replaced by the #GtkDragSource::prepare signal, which
-        returns a #GdkContentProvider for the drag operation.
-      </para>
-      <para>
-        The destination-side DND apis in GTK 4 have also been changed to use and event controller,
-        #GTkDropTarget.
-      </para>
-      <para>
-        Instead of calling gtk_drag_dest_set() and connecting to #GtkWidget signals, you create
-        a #GtkDropTarget object, attach it to the widget with gtk_widget_add_controller(), and
-        connect to #GtkDropTarget signals.
-      </para>
-      <para>
-        The ::drag-motion signal has been renamed to #GtkDragSource::accept, and instead of
-        ::drag-data-received, you need to use async read methods on the #GdkDrop object, such
-        as gdk_drop_read_value_async() or gdk_drop_read_text_async().
-      </para>
-    </section>
   </section>
 
 </chapter>

gdk/filetransferportal.c

@@ -23,10 +23,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "gdkcontentformats.h"
-#include "gdkcontentserializer.h"
-#include "gdkcontentdeserializer.h"
-
 #include <gio/gio.h>
 
 #ifdef G_OS_UNIX
@@ -47,6 +43,58 @@
 
 static GDBusProxy *file_transfer_proxy = NULL;
 
+static GDBusProxy *
+ensure_file_transfer_portal (void)
+{
+  if (file_transfer_proxy == NULL)
+    {
+      GError *error = NULL;
+
+      file_transfer_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                           G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
+                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS
+                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                                           NULL,
+                                                           "org.freedesktop.portal.Documents",
+                                                           "/org/freedesktop/portal/documents",
+                                                           "org.freedesktop.portal.FileTransfer",
+                                                           NULL, &error);
+
+      if (error)
+        {
+          g_debug ("Failed to get proxy: %s", error->message);
+          g_error_free (error);
+        }
+    }
+
+  if (file_transfer_proxy)
+    {
+      char *owner = g_dbus_proxy_get_name_owner (file_transfer_proxy);
+
+      if (owner)
+        {
+          g_free (owner);
+          return file_transfer_proxy;
+        }
+    }
+
+  return NULL;
+}
+
+gboolean
+file_transfer_portal_available (void)
+{
+  gboolean available;
+
+  ensure_file_transfer_portal ();
+
+  available = file_transfer_proxy != NULL;
+
+  g_clear_object (&file_transfer_proxy);
+
+  return available;
+}
+
 typedef struct {
   GTask *task;
   const char **files;
@@ -193,12 +241,15 @@ file_transfer_portal_register_files (const char          **files,
                                      gpointer              data)
 {
   GTask *task;
+  GDBusProxy *proxy;
   AddFileData *afd;
   GVariantBuilder options;
 
   task = g_task_new (NULL, NULL, callback, data);
 
-  if (file_transfer_proxy == NULL)
+  proxy = ensure_file_transfer_portal ();
+
+  if (proxy == NULL)
     {
       g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
                                "No portal found");
@@ -216,7 +267,7 @@ file_transfer_portal_register_files (const char          **files,
   g_variant_builder_add (&options, "{sv}", "writable", g_variant_new_boolean (writable));
   g_variant_builder_add (&options, "{sv}", "autostop", g_variant_new_boolean (TRUE));
 
-  g_dbus_proxy_call (file_transfer_proxy, "StartTransfer",
+  g_dbus_proxy_call (proxy, "StartTransfer",
                      g_variant_new ("(a{sv})", &options),
                      0, -1, NULL, start_session_done, afd);
 }
@@ -268,12 +319,15 @@ file_transfer_portal_retrieve_files (const char          *key,
                                      GAsyncReadyCallback  callback,
                                      gpointer             data)
 {
+  GDBusProxy *proxy;
   GTask *task;
   GVariantBuilder options;
 
   task = g_task_new (NULL, NULL, callback, data);
 
-  if (file_transfer_proxy == NULL)
+  proxy = ensure_file_transfer_portal ();
+
+  if (proxy == NULL)
     {
       g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
                                "No portal found");
@@ -282,7 +336,7 @@ file_transfer_portal_retrieve_files (const char          *key,
     }
 
   g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
-  g_dbus_proxy_call (file_transfer_proxy,
+  g_dbus_proxy_call (proxy,
                      "RetrieveFiles",
                      g_variant_new ("(sa{sv})", key, &options),
                      0, -1, NULL,
@@ -303,235 +357,4 @@ file_transfer_portal_retrieve_files_finish (GAsyncResult   *result,
   return FALSE;
 }
 
-
-/* serializer */
-
-static void
-file_serializer_finish (GObject      *source,
-                        GAsyncResult *result,
-                        gpointer      serializer)
-{
-  GOutputStream *stream = G_OUTPUT_STREAM (source);
-  GError *error = NULL;
-
-  if (!g_output_stream_write_all_finish (stream, result, NULL, &error))
-    gdk_content_serializer_return_error (serializer, error);
-  else
-    gdk_content_serializer_return_success (serializer);
-}
-
-static void
-portal_ready (GObject *object,
-              GAsyncResult *result,
-              gpointer serializer)
-{
-  GError *error = NULL;
-  char *key;
-
-  if (!file_transfer_portal_register_files_finish (result, &key, &error))
-    {
-      gdk_content_serializer_return_error (serializer, error);
-      return;
-    }
-
-  g_output_stream_write_all_async (gdk_content_serializer_get_output_stream (serializer),
-                                   key,
-                                   strlen (key) + 1,
-                                   gdk_content_serializer_get_priority (serializer),
-                                   gdk_content_serializer_get_cancellable (serializer),
-                                   file_serializer_finish,
-                                   serializer);
-  gdk_content_serializer_set_task_data (serializer, key, g_free);
-}
-
-static void
-portal_file_serializer (GdkContentSerializer *serializer)
-{
-  GFile *file;
-  const GValue *value;
-  GPtrArray *files;
-
-  files = g_ptr_array_new_with_free_func (g_free);
-
-  value = gdk_content_serializer_get_value (serializer);
-
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      file = g_value_get_object (gdk_content_serializer_get_value (serializer));
-      if (file)
-        g_ptr_array_add (files, g_file_get_path (file));
-      g_ptr_array_add (files, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
-    {
-      GSList *l;
-
-      for (l = g_value_get_boxed (value); l; l = l->next)
-        g_ptr_array_add (files, g_file_get_path (l->data));
-
-      g_ptr_array_add (files, NULL);
-    }
-
-  /* this call doesn't copy the strings, so keep the array around until the registration is done */
-  file_transfer_portal_register_files ((const char **)files->pdata, TRUE, portal_ready, serializer);
-  gdk_content_serializer_set_task_data (serializer, files, (GDestroyNotify)g_ptr_array_unref);
-}
-
-/* deserializer */
-
-static void
-portal_finish (GObject *object,
-               GAsyncResult *result,
-               gpointer deserializer)
-{
-  char **files = NULL;
-  GError *error = NULL;
-  GValue *value;
-
-  if (!file_transfer_portal_retrieve_files_finish (result, &files, &error))
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-
-  value = gdk_content_deserializer_get_value (deserializer);
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      if (files[0] != NULL)
-        g_value_take_object (value, g_file_new_for_path (files[0]));
-    }
-  else
-    {
-      GSList *l = NULL;
-      gsize i;
-
-      for (i = 0; files[i] != NULL; i++)
-        l = g_slist_prepend (l, g_file_new_for_path (files[i]));
-      g_value_take_boxed (value, g_slist_reverse (l));
-    }
-  g_strfreev (files);
-
-  gdk_content_deserializer_return_success (deserializer);
-}
-
-static void
-portal_file_deserializer_finish (GObject      *source,
-                                 GAsyncResult *result,
-                                 gpointer      deserializer)
-{
-  GOutputStream *stream = G_OUTPUT_STREAM (source);
-  GError *error = NULL;
-  gssize written;
-  char *key;
-
-  written = g_output_stream_splice_finish (stream, result, &error);
-  if (written < 0)
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-
-  /* write terminating NULL */
-  if (!g_output_stream_write (stream, "", 1, NULL, &error))
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-
-  key = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (stream));
-  if (key == NULL)
-    {
-      GError *gerror = g_error_new (G_IO_ERROR,
-                                    G_IO_ERROR_NOT_FOUND,
-                                    "Could not convert data from %s to %s",
-                                    gdk_content_deserializer_get_mime_type (deserializer),
-                                    g_type_name (gdk_content_deserializer_get_gtype (deserializer)));
-      gdk_content_deserializer_return_error (deserializer, gerror);
-      return;
-    }
-
-  file_transfer_portal_retrieve_files (key, portal_finish, deserializer);
-  gdk_content_deserializer_set_task_data (deserializer, key, g_free);
-}
-
-static void
-portal_file_deserializer (GdkContentDeserializer *deserializer)
-{
-  GOutputStream *output;
-
-  output = g_memory_output_stream_new_resizable ();
-
-  g_output_stream_splice_async (output,
-                                gdk_content_deserializer_get_input_stream (deserializer),
-                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-                                gdk_content_deserializer_get_priority (deserializer),
-                                gdk_content_deserializer_get_cancellable (deserializer),
-                                portal_file_deserializer_finish,
-                                deserializer);
-  g_object_unref (output);
-}
-
-static void
-got_proxy (GObject *source,
-           GAsyncResult *result,
-           gpointer data)
-{
-  GError *error = NULL;
-
-  file_transfer_proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
-  if (!file_transfer_proxy)
-    {
-      g_message ("Failed to get file transfer portal: %s", error->message);
-      g_clear_error (&error);
-      return;
-    }
-
-  gdk_content_register_serializer (G_TYPE_FILE,
-                                   "application/vnd.portal.files",
-                                   portal_file_serializer,
-                                   NULL,
-                                   NULL);
-
-  gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
-                                   "application/vnd.portal.files",
-                                   portal_file_serializer,
-                                   NULL,
-                                   NULL);
-
-  gdk_content_register_deserializer ("application/vnd.portal.files",
-                                     GDK_TYPE_FILE_LIST,
-                                     portal_file_deserializer,
-                                     NULL,
-                                     NULL);
-
-  gdk_content_register_deserializer ("application/vnd.portal.files",
-                                     G_TYPE_FILE,
-                                     portal_file_deserializer,
-                                     NULL,
-                                     NULL);
-}
-
-void
-file_transfer_portal_register (void)
-{
-  static gboolean called;
-
-  if (!called)
-    {
-      called = TRUE;
-      g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-                                G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
-                                | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS
-                                | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-                                NULL,
-                                "org.freedesktop.portal.Documents",
-                                "/org/freedesktop/portal/documents",
-                                "org.freedesktop.portal.FileTransfer",
-                                NULL,
-                                got_proxy,
-                                NULL);
-    }
-}
-
-
 #endif /* G_OS_UNIX */

gdk/filetransferportalprivate.h

@@ -19,8 +19,7 @@
 #define __FILE_TRANSFER_PROTOCOL_H__
 
 
-void     file_transfer_portal_register              (void);
-
+gboolean file_transfer_portal_available             (void);
 void     file_transfer_portal_register_files        (const char           **files,
                                                      gboolean               writable,
                                                      GAsyncReadyCallback    callback,

gdk/gdk.c

@@ -212,14 +212,14 @@ gdk_pre_parse (void)
       _gdk_debug_flags = g_parse_debug_string (debug_string,
                                               (GDebugKey *) gdk_debug_keys,
                                               G_N_ELEMENTS (gdk_debug_keys));
+
+    if (g_getenv ("GTK_TRACE_FD"))
+      gdk_profiler_start (atoi (g_getenv ("GTK_TRACE_FD")));
+    else if (g_getenv ("GTK_TRACE"))
+      gdk_profiler_start (-1);
   }
 #endif  /* G_ENABLE_DEBUG */
 
-  if (g_getenv ("GTK_TRACE_FD"))
-    gdk_profiler_start (atoi (g_getenv ("GTK_TRACE_FD")));
-  else if (g_getenv ("GTK_TRACE"))
-    gdk_profiler_start (-1);
-
 #ifndef G_HAS_CONSTRUCTORS
   stash_desktop_startup_notification_id ();
 #endif

gdk/gdkcontentdeserializer.c

@@ -24,7 +24,6 @@
 #include "gdkcontentformats.h"
 #include "filetransferportalprivate.h"
 #include "gdktexture.h"
-#include "gdkrgbaprivate.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -692,6 +691,95 @@ string_deserializer (GdkContentDeserializer *deserializer)
   g_object_unref (filter);
 }
 
+#ifdef G_OS_UNIX
+static void
+portal_finish (GObject *object,
+               GAsyncResult *result,
+               gpointer deserializer)
+{
+  char **files = NULL;
+  GError *error = NULL;
+  GValue *value;
+
+  if (!file_transfer_portal_retrieve_files_finish (result, &files, &error))
+    {
+      gdk_content_deserializer_return_error (deserializer, error);
+      return;
+    }
+
+  value = gdk_content_deserializer_get_value (deserializer);
+  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
+    {
+      if (files[0] != NULL)
+        g_value_take_object (value, g_file_new_for_path (files[0]));
+    }
+  else
+    {
+      GSList *l = NULL;
+      gsize i;
+
+      for (i = 0; files[i] != NULL; i++)
+        l = g_slist_prepend (l, g_file_new_for_path (files[i]));
+      g_value_take_boxed (value, g_slist_reverse (l));
+    }
+  g_strfreev (files);
+
+  gdk_content_deserializer_return_success (deserializer);
+}
+
+static void
+portal_file_deserializer_finish (GObject      *source,
+                                 GAsyncResult *result,
+                                 gpointer      deserializer)
+{
+  GOutputStream *stream = G_OUTPUT_STREAM (source);
+  GError *error = NULL;
+  gssize written;
+  char *key;
+
+  written = g_output_stream_splice_finish (stream, result, &error);
+  if (written < 0)
+    {
+      gdk_content_deserializer_return_error (deserializer, error);
+      return;
+    }
+
+  /* write terminating NULL */
+  if (!g_output_stream_write (stream, "", 1, NULL, &error))
+    {
+      gdk_content_deserializer_return_error (deserializer, error);
+      return;
+    }
+
+  key = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (stream));
+  if (key == NULL)
+    {
+      deserialize_not_found (deserializer);
+      return;
+    }
+
+  file_transfer_portal_retrieve_files (key, portal_finish, deserializer);
+  gdk_content_deserializer_set_task_data (deserializer, key, g_free);
+}
+
+static void
+portal_file_deserializer (GdkContentDeserializer *deserializer)
+{
+  GOutputStream *output;
+
+  output = g_memory_output_stream_new_resizable ();
+
+  g_output_stream_splice_async (output,
+                                gdk_content_deserializer_get_input_stream (deserializer),
+                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
+                                gdk_content_deserializer_get_priority (deserializer),
+                                gdk_content_deserializer_get_cancellable (deserializer),
+                                portal_file_deserializer_finish,
+                                deserializer);
+  g_object_unref (output);
+}
+#endif /* G_OS_UNIX */
+
 static void
 file_uri_deserializer_finish (GObject      *source,
                               GAsyncResult *result,
@@ -760,63 +848,6 @@ file_uri_deserializer (GdkContentDeserializer *deserializer)
   g_object_unref (output);
 }
 
-static void
-color_deserializer_finish (GObject      *source,
-                           GAsyncResult *result,
-                           gpointer      deserializer)
-{
-  GOutputStream *stream = G_OUTPUT_STREAM (source);
-  GError *error = NULL;
-  gssize written;
-
-  written = g_output_stream_splice_finish (stream, result, &error);
-  if (written < 0)
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-  else if (written == 0)
-    {
-      GdkRGBA black = GDK_RGBA ("000");
-
-      /* Never return NULL, we only return that on error */
-      g_value_set_boxed (gdk_content_deserializer_get_value (deserializer), &black);
-    }
-  else
-    {
-      guint16 *data;
-      GdkRGBA rgba;
-
-      data = (guint16 *)g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (stream));
-      rgba.red = data[0] / 65535.0;
-      rgba.green = data[1] / 65535.0;
-      rgba.blue = data[2] / 65535.0;
-      rgba.alpha = data[3] / 65535.0;
-
-      g_value_set_boxed (gdk_content_deserializer_get_value (deserializer), &rgba);
-    }
-  gdk_content_deserializer_return_success (deserializer);
-}
-
-static void
-color_deserializer (GdkContentDeserializer *deserializer)
-{
-  GOutputStream *output;
-  guint16 *data;
-
-  data = g_new0 (guint16, 4);
-  output = g_memory_output_stream_new (data, 4 * sizeof (guint16), NULL, g_free);
-
-  g_output_stream_splice_async (output,
-                                gdk_content_deserializer_get_input_stream (deserializer),
-                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-                                gdk_content_deserializer_get_priority (deserializer),
-                                gdk_content_deserializer_get_cancellable (deserializer),
-                                color_deserializer_finish,
-                                deserializer);
-  g_object_unref (output);
-}
-
 static void
 init (void)
 {
@@ -876,7 +907,13 @@ init (void)
   g_slist_free (formats);
 
 #ifdef G_OS_UNIX
-  file_transfer_portal_register ();
+  gboolean has_portal = file_transfer_portal_available ();
+  if (has_portal)
+    gdk_content_register_deserializer ("application/vnd.portal.files",
+                                       GDK_TYPE_FILE_LIST,
+                                       portal_file_deserializer,
+                                       NULL,
+                                       NULL);
 #endif
 
   gdk_content_register_deserializer ("text/uri-list",
@@ -885,6 +922,15 @@ init (void)
                                      NULL,
                                      NULL);
 
+#ifdef G_OS_UNIX
+  if (has_portal)
+    gdk_content_register_deserializer ("application/vnd.portal.files",
+                                       G_TYPE_FILE,
+                                       portal_file_deserializer,
+                                       NULL,
+                                       NULL);
+#endif
+
   gdk_content_register_deserializer ("text/uri-list",
                                      G_TYPE_FILE,
                                      file_uri_deserializer,
@@ -910,11 +956,5 @@ init (void)
                                      string_deserializer,
                                      (gpointer) "ASCII",
                                      NULL);
-
-  gdk_content_register_deserializer ("application/x-color",
-                                     GDK_TYPE_RGBA,
-                                     color_deserializer,
-                                     NULL,
-                                     NULL);
 }
 

gdk/gdkcontentproviderimpl.c

@@ -21,7 +21,6 @@
 #include "gdkcontentprovider.h"
 
 #include "gdkcontentformats.h"
-#include "gdkcontentserializer.h"
 #include "gdkintl.h"
 #include "gdkcontentproviderimpl.h"
 
@@ -281,232 +280,3 @@ gdk_content_provider_new_for_bytes (const char *mime_type,
   
   return GDK_CONTENT_PROVIDER (content);
 }
-
-#define GDK_TYPE_CONTENT_PROVIDER_CALLBACK            (gdk_content_provider_callback_get_type ())
-#define GDK_CONTENT_PROVIDER_CALLBACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_CONTENT_PROVIDER_CALLBACK, GdkContentProviderCallback))
-
-typedef struct _GdkContentProviderCallback GdkContentProviderCallback;
-typedef struct _GdkContentProviderCallbackClass GdkContentProviderCallbackClass;
-
-struct _GdkContentProviderCallback
-{
-  GdkContentProvider parent;
-
-  GType type;
-  GdkContentProviderGetValueFunc func;
-  gpointer data;
-};
-
-struct _GdkContentProviderCallbackClass
-{
-  GdkContentProviderClass parent_class;
-};
-
-GType gdk_content_provider_callback_get_type (void) G_GNUC_CONST;
-
-G_DEFINE_TYPE (GdkContentProviderCallback, gdk_content_provider_callback, GDK_TYPE_CONTENT_PROVIDER)
-
-static GdkContentFormats *
-gdk_content_provider_callback_ref_formats (GdkContentProvider *provider)
-{
-  GdkContentProviderCallback *callback = GDK_CONTENT_PROVIDER_CALLBACK (provider);
-
-  return gdk_content_formats_new_for_gtype (callback->type);
-}
-
-static gboolean
-gdk_content_provider_callback_get_value (GdkContentProvider  *provider,
-                                         GValue              *value,
-                                         GError             **error)
-{
-  GdkContentProviderCallback *callback = GDK_CONTENT_PROVIDER_CALLBACK (provider);
-
-  if (G_VALUE_HOLDS (value, callback->type) && callback->func != NULL)
-    {
-      callback->func (value, callback->data);
-      return TRUE;
-    }
-
-  return GDK_CONTENT_PROVIDER_CLASS (gdk_content_provider_callback_parent_class)->get_value (provider, value, error);
-}
-
-static void
-gdk_content_provider_callback_class_init (GdkContentProviderCallbackClass *class)
-{
-  GdkContentProviderClass *provider_class = GDK_CONTENT_PROVIDER_CLASS (class);
-
-  provider_class->ref_formats = gdk_content_provider_callback_ref_formats;
-  provider_class->get_value = gdk_content_provider_callback_get_value;
-}
-
-static void
-gdk_content_provider_callback_init (GdkContentProviderCallback *content)
-{
-}
-
-/**
- * gdk_content_provider_new_for_callback:
- * @type: the type that the callback provides
- * @func: callback to populate a #GValue
- * @data: (closure): data that gets passed to @func
- *
- * Create a content provider that provides data that is provided via a callback.
- *
- * Returns: a new #GdkContentProvider
- **/
-GdkContentProvider *
-gdk_content_provider_new_with_callback (GType                          type,
-                                        GdkContentProviderGetValueFunc func,
-                                        gpointer                       data)
-{
-  GdkContentProviderCallback *content;
-
-  content = g_object_new (GDK_TYPE_CONTENT_PROVIDER_CALLBACK, NULL);
-  content->type = type;
-  content->func = func;
-  content->data = data;
-  
-  return GDK_CONTENT_PROVIDER (content);
-}
-
-#define GDK_TYPE_CONTENT_PROVIDER_CALLBACK2            (gdk_content_provider_callback2_get_type ())
-#define GDK_CONTENT_PROVIDER_CALLBACK2(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_CONTENT_PROVIDER_CALLBACK2, GdkContentProviderCallback2))
-
-typedef struct _GdkContentProviderCallback2 GdkContentProviderCallback2;
-typedef struct _GdkContentProviderCallback2Class GdkContentProviderCallback2Class;
-
-struct _GdkContentProviderCallback2
-{
-  GdkContentProvider parent;
-
-  GdkContentFormats *formats;
-  GdkContentProviderGetBytesFunc func;
-  gpointer data;
-};
-
-struct _GdkContentProviderCallback2Class
-{
-  GdkContentProviderClass parent_class;
-};
-
-GType gdk_content_provider_callback2_get_type (void) G_GNUC_CONST;
-
-G_DEFINE_TYPE (GdkContentProviderCallback2, gdk_content_provider_callback2, GDK_TYPE_CONTENT_PROVIDER)
-
-static GdkContentFormats *
-gdk_content_provider_callback2_ref_formats (GdkContentProvider *provider)
-{
-  GdkContentProviderCallback2 *callback = GDK_CONTENT_PROVIDER_CALLBACK2 (provider);
-
-  return gdk_content_formats_ref (callback->formats);
-}
-
-static void
-gdk_content_provider_callback2_write_mime_type_done (GObject      *stream,
-                                                     GAsyncResult *result,
-                                                     gpointer      task)
-{
-  GError *error = NULL;
-
-  if (!g_output_stream_write_all_finish (G_OUTPUT_STREAM (stream), result, NULL, &error))
-    g_task_return_error (task, error);
-  else
-    g_task_return_boolean (task, TRUE);
-
-  g_object_unref (task);
-}
-
-static void
-gdk_content_provider_callback2_write_mime_type_async (GdkContentProvider     *provider,
-                                                      const char             *mime_type,
-                                                      GOutputStream          *stream,
-                                                      int                     io_priority,
-                                                      GCancellable           *cancellable,
-                                                      GAsyncReadyCallback     callback,
-                                                      gpointer                user_data)
-{
-  GdkContentProviderCallback2 *content = GDK_CONTENT_PROVIDER_CALLBACK2 (provider);
-  GTask *task;
-  GBytes *bytes;
-
-  task = g_task_new (content, cancellable, callback, user_data);
-  g_task_set_priority (task, io_priority);
-  g_task_set_source_tag (task, gdk_content_provider_callback2_write_mime_type_async);
-
-  if (!gdk_content_formats_contain_mime_type (content->formats, mime_type))
-    {
-      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("Cannot provide contents as “%s”"), mime_type);
-      g_object_unref (task);
-      return;
-    }
-
-  bytes = content->func (mime_type, content->data);
-  if (!bytes)
-    {
-      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("Failed to get contents as “%s”"), mime_type);
-      g_object_unref (task);
-      return;
-    }
-
-  g_object_set_data_full (G_OBJECT (task), "bytes", bytes, (GDestroyNotify)g_bytes_unref);
-
-  g_output_stream_write_all_async (stream,
-                                   g_bytes_get_data (bytes, NULL),
-                                   g_bytes_get_size (bytes),
-                                   io_priority,
-                                   cancellable,
-                                   gdk_content_provider_callback2_write_mime_type_done,
-                                   task);
-}
-
-static gboolean
-gdk_content_provider_callback2_write_mime_type_finish (GdkContentProvider *provider,
-                                                       GAsyncResult       *result,
-                                                       GError            **error)
-{
-  g_return_val_if_fail (g_task_is_valid (result, provider), FALSE);
-  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == gdk_content_provider_callback2_write_mime_type_async, FALSE);
-
-  return g_task_propagate_boolean (G_TASK (result), error);
-}
-
-static void
-gdk_content_provider_callback2_class_init (GdkContentProviderCallback2Class *class)
-{
-  GdkContentProviderClass *provider_class = GDK_CONTENT_PROVIDER_CLASS (class);
-
-  provider_class->ref_formats = gdk_content_provider_callback2_ref_formats;
-  provider_class->write_mime_type_async = gdk_content_provider_callback2_write_mime_type_async;
-  provider_class->write_mime_type_finish = gdk_content_provider_callback2_write_mime_type_finish;
-}
-
-static void
-gdk_content_provider_callback2_init (GdkContentProviderCallback2 *content)
-{
-}
-
-/**
- * gdk_content_provider_new_with_formats:
- * @formats: formats to advertise
- * @func: callback to populate a #GValue
- * @data: data that gets passed to @func
- *
- * Create a content provider that provides data that is provided via a callback.
- *
- * Returns: a new #GdkContentProvider
- **/
-GdkContentProvider *
-gdk_content_provider_new_with_formats (GdkContentFormats              *formats,
-                                       GdkContentProviderGetBytesFunc  func,
-                                       gpointer                        data)
-{
-  GdkContentProviderCallback2 *content;
-  content = g_object_new (GDK_TYPE_CONTENT_PROVIDER_CALLBACK2, NULL);
-  content->formats = gdk_content_formats_union_serialize_mime_types (gdk_content_formats_ref (formats));
-  content->func = func;
-  content->data = data;
-  
-  return GDK_CONTENT_PROVIDER (content);
-}

gdk/gdkcontentproviderimpl.h

@@ -35,21 +35,6 @@ GDK_AVAILABLE_IN_ALL
 GdkContentProvider *    gdk_content_provider_new_for_bytes              (const char             *mime_type,
                                                                          GBytes                 *bytes);
 
-typedef void (*GdkContentProviderGetValueFunc) (GValue   *value,
-                                                gpointer  data);
-
-GDK_AVAILABLE_IN_ALL
-GdkContentProvider *    gdk_content_provider_new_with_callback (GType                           type,
-                                                                GdkContentProviderGetValueFunc  func,
-                                                                gpointer                        data);
-
-typedef GBytes * (*GdkContentProviderGetBytesFunc) (const char *mime_type,
-                                                    gpointer    data);
-
-GDK_AVAILABLE_IN_ALL
-GdkContentProvider *    gdk_content_provider_new_with_formats  (GdkContentFormats              *formats,
-                                                                GdkContentProviderGetBytesFunc  func,
-                                                                gpointer                        data);
 
 G_END_DECLS
 

gdk/gdkcontentserializer.c

@@ -25,7 +25,6 @@
 #include "gdkpixbuf.h"
 #include "filetransferportalprivate.h"
 #include "gdktextureprivate.h"
-#include "gdkrgba.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <string.h>
@@ -703,6 +702,65 @@ file_serializer_finish (GObject      *source,
     gdk_content_serializer_return_success (serializer);
 }
 
+#ifdef G_OS_UNIX
+static void
+portal_ready (GObject *object,
+              GAsyncResult *result,
+              gpointer serializer)
+{
+  GError *error = NULL;
+  char *key;
+
+  if (!file_transfer_portal_register_files_finish (result, &key, &error))
+    {
+      gdk_content_serializer_return_error (serializer, error);
+      return;
+    }
+
+  g_output_stream_write_all_async (gdk_content_serializer_get_output_stream (serializer),
+                                   key,
+                                   strlen (key) + 1,
+                                   gdk_content_serializer_get_priority (serializer),
+                                   gdk_content_serializer_get_cancellable (serializer),
+                                   file_serializer_finish,
+                                   serializer);
+  gdk_content_serializer_set_task_data (serializer, key, g_free);
+}
+
+static void
+portal_file_serializer (GdkContentSerializer *serializer)
+{
+  GFile *file;
+  const GValue *value;
+  GPtrArray *files;
+
+  files = g_ptr_array_new_with_free_func (g_free);
+
+  value = gdk_content_serializer_get_value (serializer);
+
+  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
+    {
+      file = g_value_get_object (gdk_content_serializer_get_value (serializer));
+      if (file)
+        g_ptr_array_add (files, g_file_get_path (file));
+      g_ptr_array_add (files, NULL);
+    }
+  else if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
+    {
+      GSList *l;
+
+      for (l = g_value_get_boxed (value); l; l = l->next)
+        g_ptr_array_add (files, g_file_get_path (l->data));
+
+      g_ptr_array_add (files, NULL);
+    }
+
+  /* this call doesn't copy the strings, so keep the array around until the registration is done */
+  file_transfer_portal_register_files ((const char **)files->pdata, TRUE, portal_ready, serializer);
+  gdk_content_serializer_set_task_data (serializer, files, (GDestroyNotify)g_ptr_array_unref);
+}
+#endif /* G_OS_UNIX */
+
 static void
 file_uri_serializer (GdkContentSerializer *serializer)
 {
@@ -804,48 +862,6 @@ file_text_serializer (GdkContentSerializer *serializer)
   gdk_content_serializer_set_task_data (serializer, path, g_free);
 }
 
-static void
-color_serializer_finish (GObject      *source,
-                         GAsyncResult *result,
-                         gpointer      serializer)
-{
-  GOutputStream *stream = G_OUTPUT_STREAM (source);
-  GError *error = NULL;
-
-  if (!g_output_stream_write_all_finish (stream, result, NULL, &error))
-    gdk_content_serializer_return_error (serializer, error);
-  else
-    gdk_content_serializer_return_success (serializer);
-}
-
-static void
-color_serializer (GdkContentSerializer *serializer)
-{
-  const GValue *value;
-  GdkRGBA *rgba;
-  guint16 *data;
-
-  value = gdk_content_serializer_get_value (serializer);
-  rgba = g_value_get_boxed (value);
-  data = g_new0 (guint16, 4);
-  if (rgba)
-    {
-      data[0] = (guint16) (rgba->red * 65535);
-      data[1] = (guint16) (rgba->green * 65535);
-      data[2] = (guint16) (rgba->blue * 65535);
-      data[3] = (guint16) (rgba->alpha * 65535);
-    }
-
-  g_output_stream_write_all_async (gdk_content_serializer_get_output_stream (serializer),
-                                   data,
-                                   4 * sizeof (guint16),
-                                   gdk_content_serializer_get_priority (serializer),
-                                   gdk_content_serializer_get_cancellable (serializer),
-                                   color_serializer_finish,
-                                   serializer);
-  gdk_content_serializer_set_task_data (serializer, data, g_free);
-}
-
 static void
 init (void)
 {
@@ -908,7 +924,14 @@ init (void)
   g_slist_free (formats);
 
 #ifdef G_OS_UNIX
-  file_transfer_portal_register ();
+  gboolean has_portal = file_transfer_portal_available ();
+
+  if (has_portal)
+    gdk_content_register_serializer (G_TYPE_FILE,
+                                     "application/vnd.portal.files",
+                                     portal_file_serializer,
+                                     NULL,
+                                     NULL);
 #endif
 
   gdk_content_register_serializer (G_TYPE_FILE,
@@ -922,6 +945,15 @@ init (void)
                                    NULL,
                                    NULL);
 
+#ifdef G_OS_UNIX
+  if (has_portal)
+    gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
+                                     "application/vnd.portal.files",
+                                     portal_file_serializer,
+                                     NULL,
+                                     NULL);
+#endif
+
   gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
                                    "text/uri-list",
                                    file_uri_serializer,
@@ -952,11 +984,5 @@ init (void)
                                    string_serializer,
                                    (gpointer) "ASCII",
                                    NULL);
-
-  gdk_content_register_serializer (GDK_TYPE_RGBA,
-                                   "application/x-color",
-                                   color_serializer,
-                                   NULL,
-                                   NULL);
 }
 

gdk/gdkdrag.c

@@ -90,30 +90,20 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkDrag, gdk_drag, G_TYPE_OBJECT)
 
 /**
  * SECTION:dnd
- * @Title: Drag And Drop
- * @Short_description: Functions for controlling drag and drop handling
+ * @title: Drag And Drop
+ * @short_description: Functions for controlling drag and drop handling
  *
- * These functions provide a low-level interface for drag and drop.
+ * These functions provide a low level interface for drag and drop.
  *
  * The GdkDrag object represents the source side of an ongoing DND operation.
  * It is created when a drag is started, and stays alive for duration of
- * the DND operation. After a drag has been started with gdk_drag_begin(),
- * the caller gets informed about the status of the ongoing drag operation
- * with signals on the #GtkDrag object.
+ * the DND operation.
  *
  * The GdkDrop object represents the target side of an ongoing DND operation.
- * Possible drop sites get informed about the status of the ongoing drag operation
- * with events of type %GDK_DRAG_ENTER, %GDK_DRAG_LEAVE, %GDK_DRAG_MOTION and
- * %GDK_DROP_START. The #GdkDrop object can be obtained from these #GdkEvents
- * using gdk_event_get_drop().
- *
- * The actual data transfer is initiated from the target side via an async
- * read, using one of the GdkDrop functions for this purpose: gdk_drop_read_async(),
- * gdk_drop_read_value_async() or gdk_drop_read_text_async().
  * 
- * GTK provides a higher level abstraction based on top of these functions,
- * and so they are not normally needed in GTK applications. See the
- * [Drag and Drop][gtk4-Drag-and-Drop] section of the GTK documentation
+ * GTK+ provides a higher level abstraction based on top of these functions,
+ * and so they are not normally needed in GTK+ applications. See the
+ * [Drag and Drop][gtk4-Drag-and-Drop] section of the GTK+ documentation
  * for more information.
  */
 

gdk/gdkdrop.c

@@ -1001,30 +1001,3 @@ gdk_drop_emit_drop_event (GdkDrop  *self,
   gdk_drop_do_emit_event (event, dont_queue);
 }
 
-/**
- * gdk_drop_has_value:
- * @self: a #GdkDrop
- * @type: the type to check
- *
- * Returns whether calling gdk_drop_read_value_async() for @type
- * can succeed.
- *
- * Returns: %TRUE if the data can be deserialized to the given type
- */ 
-gboolean
-gdk_drop_has_value (GdkDrop *self,
-                    GType    type)
-{
-  GdkContentFormats *formats;
-  gboolean ret;
-
-  formats = gdk_content_formats_ref (gdk_drop_get_formats (self));
-  formats = gdk_content_formats_union_deserialize_gtypes (formats);
-
-  ret = gdk_content_formats_contain_gtype (formats, type);
-
-  gdk_content_formats_unref (formats);
-
-  return ret;
-}
-

gdk/gdkdrop.h

@@ -92,9 +92,6 @@ char *                  gdk_drop_read_text_finish       (GdkDrop
                                                          GAsyncResult           *result,
                                                          GError                **error);
 
-GDK_AVAILABLE_IN_ALL
-gboolean                gdk_drop_has_value              (GdkDrop                *self,
-                                                         GType                   type);
 
 G_END_DECLS
 

gdk/gdkevents.c

@@ -1013,13 +1013,6 @@ gdk_event_set_coords (GdkEvent *event,
       event->touchpad_pinch.x = x;
       event->touchpad_pinch.y = y;
       break;
-    case GDK_DRAG_ENTER:
-    case GDK_DRAG_LEAVE:
-    case GDK_DRAG_MOTION:
-    case GDK_DROP_START:
-      event->dnd.x = x;
-      event->dnd.y = y;
-      break;
     default:
       break;
     }

gdk/gdkframeclock.c

@@ -649,94 +649,46 @@ gdk_frame_clock_get_refresh_info (GdkFrameClock *frame_clock,
 void
 _gdk_frame_clock_emit_flush_events (GdkFrameClock *frame_clock)
 {
-  guint64 before = g_get_monotonic_time ();
-
   g_signal_emit (frame_clock, signals[FLUSH_EVENTS], 0);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000,
-                           (g_get_monotonic_time () - before) * 1000,
-                           "frameclock ::flush-events", "");
 }
 
 void
 _gdk_frame_clock_emit_before_paint (GdkFrameClock *frame_clock)
 {
-  guint64 before = g_get_monotonic_time ();
-
   g_signal_emit (frame_clock, signals[BEFORE_PAINT], 0);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000,
-                           (g_get_monotonic_time () - before) * 1000,
-                           "frameclock ::before-paint", "");
 }
 
 void
 _gdk_frame_clock_emit_update (GdkFrameClock *frame_clock)
 {
-  guint64 before = g_get_monotonic_time ();
-
   g_signal_emit (frame_clock, signals[UPDATE], 0);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000,
-                           (g_get_monotonic_time () - before) * 1000,
-                           "frameclock ::update", "");
 }
 
 void
 _gdk_frame_clock_emit_layout (GdkFrameClock *frame_clock)
 {
-  guint64 before = g_get_monotonic_time ();
-
   g_signal_emit (frame_clock, signals[LAYOUT], 0);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000,
-                           (g_get_monotonic_time () - before) * 1000,
-                           "frameclock ::layout", "");
 }
 
 void
 _gdk_frame_clock_emit_paint (GdkFrameClock *frame_clock)
 {
-  guint64 before = g_get_monotonic_time ();
-
   g_signal_emit (frame_clock, signals[PAINT], 0);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000,
-                           (g_get_monotonic_time () - before) * 1000,
-                           "frameclock ::paint", "");
 }
 
 void
 _gdk_frame_clock_emit_after_paint (GdkFrameClock *frame_clock)
 {
-  guint64 before = g_get_monotonic_time ();
-
   g_signal_emit (frame_clock, signals[AFTER_PAINT], 0);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000,
-                           (g_get_monotonic_time () - before) * 1000,
-                           "frameclock ::after-paint", "");
 }
 
 void
 _gdk_frame_clock_emit_resume_events (GdkFrameClock *frame_clock)
 {
-  guint64 before = g_get_monotonic_time ();
-
   g_signal_emit (frame_clock, signals[RESUME_EVENTS], 0);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000,
-                           (g_get_monotonic_time () - before) * 1000,
-                           "frameclock ::resume-events", "");
 }
 
+#ifdef G_ENABLE_DEBUG
 static gint64
 guess_refresh_interval (GdkFrameClock *frame_clock)
 {
@@ -806,17 +758,34 @@ frame_clock_get_fps (GdkFrameClock *frame_clock)
     
   return ((double) end_counter - start_counter) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
 }
+#endif
 
 void
 _gdk_frame_clock_add_timings_to_profiler (GdkFrameClock   *clock,
                                           GdkFrameTimings *timings)
 {
+#ifdef G_ENABLE_DEBUG
+  gdk_profiler_add_mark (timings->frame_time * 1000,
+                         (timings->frame_end_time - timings->frame_time) * 1000,
+                         "frame", "");
+
+  if (timings->layout_start_time != 0)
+    gdk_profiler_add_mark (timings->layout_start_time * 1000,
+                           (timings->paint_start_time - timings->layout_start_time) * 1000,
+                            "layout", "");
+
+  if (timings->paint_start_time != 0)
+    gdk_profiler_add_mark (timings->paint_start_time * 1000,
+                           (timings->frame_end_time - timings->paint_start_time) * 1000,
+                            "paint", "");
+
   if (timings->presentation_time != 0)
     gdk_profiler_add_mark (timings->presentation_time * 1000,
                            0,
                            "presentation", "");
 
   gdk_profiler_set_counter (fps_counter,
-                            timings->presentation_time * 1000,
+                            timings->frame_end_time * 1000,
                             frame_clock_get_fps (clock)); 
+#endif
 }

gdk/gdkframeclockidle.c

@@ -42,7 +42,9 @@ struct _GdkFrameClockIdlePrivate
   gint64 frame_time;
   gint64 min_next_frame_time;
   gint64 sleep_serial;
+#ifdef G_ENABLE_DEBUG
   gint64 freeze_time;
+#endif
 
   guint flush_idle_id;
   guint paint_idle_id;
@@ -317,7 +319,6 @@ gdk_frame_clock_paint_idle (void *data)
   GdkFrameClockIdlePrivate *priv = clock_idle->priv;
   gboolean skip_to_resume_events;
   GdkFrameTimings *timings = NULL;
-  gint64 before = g_get_monotonic_time ();
 
   priv->paint_idle_id = 0;
   priv->in_paint_idle = TRUE;
@@ -408,13 +409,13 @@ gdk_frame_clock_paint_idle (void *data)
             {
 	      int iter;
 #ifdef G_ENABLE_DEBUG
-              if (GDK_DEBUG_CHECK (FRAMES))
+              if (GDK_DEBUG_CHECK (FRAMES) || gdk_profiler_is_running ())
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_LAYOUT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT))
                     timings->layout_start_time = g_get_monotonic_time ();
                 }
-#endif
+#endif /* G_ENABLE_DEBUG */
 
               priv->phase = GDK_FRAME_CLOCK_PHASE_LAYOUT;
 	      /* We loop in the layout phase, because we don't want to progress
@@ -438,13 +439,13 @@ gdk_frame_clock_paint_idle (void *data)
           if (priv->freeze_count == 0)
             {
 #ifdef G_ENABLE_DEBUG
-              if (GDK_DEBUG_CHECK (FRAMES))
+              if (GDK_DEBUG_CHECK (FRAMES) || gdk_profiler_is_running ())
                 {
                   if (priv->phase != GDK_FRAME_CLOCK_PHASE_PAINT &&
                       (priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT))
                     timings->paint_start_time = g_get_monotonic_time ();
                 }
-#endif
+#endif /* G_ENABLE_DEBUG */
 
               priv->phase = GDK_FRAME_CLOCK_PHASE_PAINT;
               if (priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT)
@@ -465,7 +466,7 @@ gdk_frame_clock_paint_idle (void *data)
               priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
             }
 #ifdef G_ENABLE_DEBUG
-            if (GDK_DEBUG_CHECK (FRAMES))
+            if (GDK_DEBUG_CHECK (FRAMES) || gdk_profiler_is_running ())
               timings->frame_end_time = g_get_monotonic_time ();
 #endif /* G_ENABLE_DEBUG */
           G_GNUC_FALLTHROUGH;
@@ -501,9 +502,6 @@ gdk_frame_clock_paint_idle (void *data)
   if (priv->freeze_count == 0)
     priv->sleep_serial = get_sleep_serial ();
 
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000, (g_get_monotonic_time () - before) * 1000, "frameclock", "paint_idle");
-
   return FALSE;
 }
 
@@ -563,11 +561,13 @@ gdk_frame_clock_idle_freeze (GdkFrameClock *clock)
   GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
   GdkFrameClockIdlePrivate *priv = clock_idle->priv;
 
+#ifdef G_ENABLE_DEBUG
   if (priv->freeze_count == 0)
     {
       if (gdk_profiler_is_running ())
         priv->freeze_time = g_get_monotonic_time ();
     }
+#endif
 
   priv->freeze_count++;
   maybe_stop_idle (clock_idle);
@@ -594,6 +594,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
 
       priv->sleep_serial = get_sleep_serial ();
 
+#ifdef G_ENABLE_DEBUG
       if (gdk_profiler_is_running ())
         {
           if (priv->freeze_time != 0)
@@ -601,10 +602,11 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
               gint64 thaw_time = g_get_monotonic_time ();
               gdk_profiler_add_mark (priv->freeze_time * 1000,
                                      (thaw_time - priv->freeze_time) * 1000,
-                                     "frameclock freeze", "");
+                                     "freeze", "");
               priv->freeze_time = 0;
             }
         }
+#endif
     }
 }
 

gdk/gdkrgba.h

@@ -53,15 +53,15 @@ GDK_AVAILABLE_IN_ALL
 void      gdk_rgba_free      (GdkRGBA       *rgba);
 
 GDK_AVAILABLE_IN_ALL
-gboolean  gdk_rgba_is_clear  (const GdkRGBA *rgba) G_GNUC_PURE;
+gboolean  gdk_rgba_is_clear  (const GdkRGBA *rgba);
 GDK_AVAILABLE_IN_ALL
-gboolean  gdk_rgba_is_opaque (const GdkRGBA *rgba) G_GNUC_PURE;
+gboolean  gdk_rgba_is_opaque (const GdkRGBA *rgba);
 
 GDK_AVAILABLE_IN_ALL
-guint     gdk_rgba_hash      (gconstpointer  p) G_GNUC_PURE;
+guint     gdk_rgba_hash      (gconstpointer  p);
 GDK_AVAILABLE_IN_ALL
 gboolean  gdk_rgba_equal     (gconstpointer  p1,
-                              gconstpointer  p2) G_GNUC_PURE;
+                              gconstpointer  p2);
 
 GDK_AVAILABLE_IN_ALL
 gboolean  gdk_rgba_parse     (GdkRGBA       *rgba,

gdk/gdkseat.c

@@ -248,10 +248,10 @@ gdk_seat_get_capabilities (GdkSeat *seat)
  *          elsewhere.
  * @event: (nullable): the event that is triggering the grab, or %NULL if none
  *         is available.
- * @prepare_func: (nullable) (scope call): function to
+ * @prepare_func: (nullable) (scope call) (closure prepare_func_data): function to
  *                prepare the surface to be grabbed, it can be %NULL if @surface is
  *                visible before this call.
- * @prepare_func_data: (closure): user data to pass to @prepare_func
+ * @prepare_func_data: user data to pass to @prepare_func
  *
  * Grabs the seat so that all events corresponding to the given @capabilities
  * are passed to this application until the seat is ungrabbed with gdk_seat_ungrab(),

gdk/gdksurface.c

@@ -3583,13 +3583,7 @@ gdk_surface_register_dnd (GdkSurface *surface)
  *
  * Starts a drag and creates a new drag context for it.
  *
- * This function is called by the drag source. After this call, you
- * probably want to set up the drag icon using the surface returned
- * by gdk_drag_get_drag_surface().
- *
- * Note: if @actions include %GDK_ACTION_MOVE, you need to listen for
- * the #GdkDrag::dnd-finished signal and delete the data at the source
- * if gdk_drag_get_selected_action() returns %GDK_ACTION_MOVE.
+ * This function is called by the drag source.
  *
  * Returns: (transfer full) (nullable): a newly created #GdkDrag or
  *     %NULL on error.
@@ -4005,6 +3999,7 @@ rewrite_event_for_toplevel (GdkEvent *event)
   g_set_object (&event->any.surface, surface);
 }
 
+#ifdef G_ENABLE_DEBUG
 static void
 add_event_mark (GdkEvent *event,
                 gint64    time,
@@ -4071,9 +4066,6 @@ add_event_mark (GdkEvent *event,
 
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
-        message = g_strdup ("");
-        break;
-
     case GDK_TOUCHPAD_SWIPE:
     case GDK_TOUCHPAD_PINCH:
     case GDK_SCROLL:
@@ -4115,11 +4107,14 @@ add_event_mark (GdkEvent *event,
 
   g_free (message);
 }
+#endif
 
 gboolean
 gdk_surface_handle_event (GdkEvent *event)
 {
+#ifdef G_ENABLE_DEBUG
   gint64 begin_time = g_get_monotonic_time ();
+#endif
   gboolean handled = FALSE;
 
   if (check_autohide (event))
@@ -4138,8 +4133,10 @@ gdk_surface_handle_event (GdkEvent *event)
       g_signal_emit (gdk_event_get_surface (event), signals[EVENT], 0, event, &handled);
     }
 
+#ifdef G_ENABLE_DEBUG
   if (gdk_profiler_is_running ())
     add_event_mark (event, begin_time, g_get_monotonic_time () - begin_time);
+#endif
 
   return handled;
 }

gdk/gdktexture.h

@@ -51,9 +51,9 @@ GdkTexture *            gdk_texture_new_from_file              (GFile
                                                                 GError         **error);
 
 GDK_AVAILABLE_IN_ALL
-int                     gdk_texture_get_width                  (GdkTexture      *texture) G_GNUC_PURE;
+int                     gdk_texture_get_width                  (GdkTexture      *texture);
 GDK_AVAILABLE_IN_ALL
-int                     gdk_texture_get_height                 (GdkTexture      *texture) G_GNUC_PURE;
+int                     gdk_texture_get_height                 (GdkTexture      *texture);
 
 GDK_AVAILABLE_IN_ALL
 void                    gdk_texture_download                   (GdkTexture      *texture,

gdk/quartz/gdkkeys-quartz.c

@@ -680,6 +680,7 @@ gdk_quartz_keymap_translate_keyboard_state (GdkKeymap       *keymap,
 {
   guint tmp_keyval;
   GdkModifierType bit;
+  guint tmp_modifiers = 0;
 
   if (keyval)
     *keyval = 0;
@@ -693,23 +694,24 @@ gdk_quartz_keymap_translate_keyboard_state (GdkKeymap       *keymap,
   if (hardware_keycode < 0 || hardware_keycode >= NUM_KEYCODES)
     return FALSE;
 
+  /* Check if modifiers modify the keyval */
+  for (bit = GDK_SHIFT_MASK; bit < GDK_BUTTON1_MASK; bit <<= 1)
+    {
+      if (translate_keysym (hardware_keycode,
+                            (bit == GDK_MOD1_MASK) ? 0 : group,
+                            state & ~bit,
+                            NULL, NULL) !=
+	  translate_keysym (hardware_keycode,
+                            (bit == GDK_MOD1_MASK) ? 1 : group,
+                            state | bit,
+                            NULL, NULL))
+	tmp_modifiers |= bit;
+    }
+
   tmp_keyval = translate_keysym (hardware_keycode, group, state, level, effective_group);
 
-  /* Check if modifiers modify the keyval */
   if (consumed_modifiers)
-    {
-      guint tmp_modifiers = (state & GDK_MODIFIER_MASK);
-
-      for (bit = 1; bit <= tmp_modifiers; bit <<= 1)
-        {
-          if ((bit & tmp_modifiers) &&
-              translate_keysym (hardware_keycode, group, state & ~bit,
-                                NULL, NULL) == tmp_keyval)
-            tmp_modifiers &= ~bit;
-        }
-
-      *consumed_modifiers = tmp_modifiers;
-    }
+    *consumed_modifiers = tmp_modifiers;
 
   if (keyval)
     *keyval = tmp_keyval; 

gdk/wayland/cursor/meson.build

@@ -1,12 +0,0 @@
-wayland_cursor_sources = files([
-  'wayland-cursor.c',
-  'xcursor.c',
-  'os-compatibility.c'
-])
-
-libwayland_cursor = static_library('wayland+cursor',
-                                   sources: wayland_cursor_sources,
-                                   include_directories: [ confinc, ],
-                                   dependencies: [ glib_dep, ],
-                                   c_args: common_cflags,
-                                   link_args: common_ldflags)

gdk/wayland/cursor/os-compatibility.c

@@ -1,173 +0,0 @@
-/*
- * Copyright © 2012 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define HAVE_MEMFD_CREATE
-#ifdef HAVE_MEMFD_CREATE
-#include <sys/mman.h>
-#endif
-
-#include "os-compatibility.h"
-
-#ifndef HAVE_MKOSTEMP
-static int
-set_cloexec_or_close(int fd)
-{
-	long flags;
-
-	if (fd == -1)
-		return -1;
-
-	flags = fcntl(fd, F_GETFD);
-	if (flags == -1)
-		goto err;
-
-	if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1)
-		goto err;
-
-	return fd;
-
-err:
-	close(fd);
-	return -1;
-}
-#endif
-
-static int
-create_tmpfile_cloexec(char *tmpname)
-{
-	int fd;
-
-#ifdef HAVE_MKOSTEMP
-	fd = mkostemp(tmpname, O_CLOEXEC);
-	if (fd >= 0)
-		unlink(tmpname);
-#else
-	fd = mkstemp(tmpname);
-	if (fd >= 0) {
-		fd = set_cloexec_or_close(fd);
-		unlink(tmpname);
-	}
-#endif
-
-	return fd;
-}
-
-/*
- * Create a new, unique, anonymous file of the given size, and
- * return the file descriptor for it. The file descriptor is set
- * CLOEXEC. The file is immediately suitable for mmap()'ing
- * the given size at offset zero.
- *
- * The file should not have a permanent backing store like a disk,
- * but may have if XDG_RUNTIME_DIR is not properly implemented in OS.
- *
- * The file name is deleted from the file system.
- *
- * The file is suitable for buffer sharing between processes by
- * transmitting the file descriptor over Unix sockets using the
- * SCM_RIGHTS methods.
- *
- * If the C library implements posix_fallocate(), it is used to
- * guarantee that disk space is available for the file at the
- * given size. If disk space is insufficent, errno is set to ENOSPC.
- * If posix_fallocate() is not supported, program may receive
- * SIGBUS on accessing mmap()'ed file contents instead.
- *
- * If the C library implements memfd_create(), it is used to create the
- * file purely in memory, without any backing file name on the file
- * system, and then sealing off the possibility of shrinking it.  This
- * can then be checked before accessing mmap()'ed file contents, to
- * make sure SIGBUS can't happen.  It also avoids requiring
- * XDG_RUNTIME_DIR.
- */
-int
-os_create_anonymous_file(off_t size)
-{
-	static const char template[] = "/wayland-cursor-shared-XXXXXX";
-	const char *path;
-	char *name;
-	int fd;
-	int ret;
-
-#ifdef HAVE_MEMFD_CREATE
-	fd = memfd_create("wayland-cursor", MFD_CLOEXEC | MFD_ALLOW_SEALING);
-	if (fd >= 0) {
-		/* We can add this seal before calling posix_fallocate(), as
-		 * the file is currently zero-sized anyway.
-		 *
-		 * There is also no need to check for the return value, we
-		 * couldn't do anything with it anyway.
-		 */
-		fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL);
-	} else
-#endif
-	{
-		path = getenv("XDG_RUNTIME_DIR");
-		if (!path) {
-			errno = ENOENT;
-			return -1;
-		}
-
-		name = malloc(strlen(path) + sizeof(template));
-		if (!name)
-			return -1;
-
-		strcpy(name, path);
-		strcat(name, template);
-
-		fd = create_tmpfile_cloexec(name);
-
-		free(name);
-
-		if (fd < 0)
-			return -1;
-	}
-
-#ifdef HAVE_POSIX_FALLOCATE
-	ret = posix_fallocate(fd, 0, size);
-	if (ret != 0) {
-		close(fd);
-		errno = ret;
-		return -1;
-	}
-#else
-	ret = ftruncate(fd, size);
-	if (ret < 0) {
-		close(fd);
-		return -1;
-	}
-#endif
-
-	return fd;
-}

gdk/wayland/cursor/os-compatibility.h

@@ -1,34 +0,0 @@
-/*
- * Copyright © 2012 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef OS_COMPATIBILITY_H
-#define OS_COMPATIBILITY_H
-
-#include <sys/types.h>
-
-int
-os_create_anonymous_file(off_t size);
-
-#endif /* OS_COMPATIBILITY_H */

gdk/wayland/cursor/wayland-cursor.c

@@ -1,385 +0,0 @@
-/*
- * Copyright © 2012 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "config.h"
-#include "xcursor.h"
-#include "wayland-cursor.h"
-#include "wayland-client.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <os-compatibility.h>
-#include <glib.h>
-
-#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
-
-struct shm_pool {
-	struct wl_shm_pool *pool;
-	int fd;
-	unsigned int size;
-	unsigned int used;
-	char *data;
-};
-
-static struct shm_pool *
-shm_pool_create(struct wl_shm *shm, int size)
-{
-	struct shm_pool *pool;
-
-	pool = malloc(sizeof *pool);
-	if (!pool)
-		return NULL;
-
-	pool->fd = os_create_anonymous_file (size);
-	if (pool->fd < 0)
-		goto err_free;
-
-	pool->data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-			  pool->fd, 0);
-
-	if (pool->data == MAP_FAILED)
-		goto err_close;
-
-	pool->pool = wl_shm_create_pool(shm, pool->fd, size);
-	pool->size = size;
-	pool->used = 0;
-
-	return pool;
-
-err_close:
-	close(pool->fd);
-err_free:
-	free(pool);
-	return NULL;
-}
-
-static int
-shm_pool_resize(struct shm_pool *pool, int size)
-{
-	if (ftruncate(pool->fd, size) < 0)
-		return 0;
-
-#ifdef HAVE_POSIX_FALLOCATE
-	errno = posix_fallocate(pool->fd, 0, size);
-	if (errno != 0)
-		return 0;
-#endif
-
-	wl_shm_pool_resize(pool->pool, size);
-
-	munmap(pool->data, pool->size);
-
-	pool->data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-			  pool->fd, 0);
-	if (pool->data == (void *)-1)
-		return 0;
-	pool->size = size;
-
-	return 1;
-}
-
-static int
-shm_pool_allocate(struct shm_pool *pool, int size)
-{
-	int offset;
-
-	if (pool->used + size > pool->size)
-		if (!shm_pool_resize(pool, 2 * pool->size + size))
-			return -1;
-
-	offset = pool->used;
-	pool->used += size;
-
-	return offset;
-}
-
-static void
-shm_pool_destroy(struct shm_pool *pool)
-{
-	munmap(pool->data, pool->size);
-	wl_shm_pool_destroy(pool->pool);
-	close(pool->fd);
-	free(pool);
-}
-
-
-struct wl_cursor_theme {
-	unsigned int cursor_count;
-	struct wl_cursor **cursors;
-	struct wl_shm *shm;
-	struct shm_pool *pool;
-	int size;
-        char *path;
-};
-
-struct cursor_image {
-	struct wl_cursor_image image;
-	struct wl_cursor_theme *theme;
-	struct wl_buffer *buffer;
-	int offset; /* data offset of this image in the shm pool */
-};
-
-struct cursor {
-	struct wl_cursor cursor;
-	uint32_t total_delay; /* length of the animation in ms */
-};
-
-/** Get an shm buffer for a cursor image
- *
- * \param image The cursor image
- * \return An shm buffer for the cursor image. The user should not destroy
- * the returned buffer.
- */
-struct wl_buffer *
-wl_cursor_image_get_buffer(struct wl_cursor_image *_img)
-{
-	struct cursor_image *image = (struct cursor_image *) _img;
-	struct wl_cursor_theme *theme = image->theme;
-
-	if (!image->buffer) {
-		image->buffer =
-			wl_shm_pool_create_buffer(theme->pool->pool,
-						  image->offset,
-						  _img->width, _img->height,
-						  _img->width * 4,
-						  WL_SHM_FORMAT_ARGB8888);
-	};
-
-	return image->buffer;
-}
-
-static void
-wl_cursor_image_destroy(struct wl_cursor_image *_img)
-{
-	struct cursor_image *image = (struct cursor_image *) _img;
-
-	if (image->buffer)
-		wl_buffer_destroy(image->buffer);
-
-	free(image);
-}
-
-static void
-wl_cursor_destroy(struct wl_cursor *cursor)
-{
-	unsigned int i;
-
-	for (i = 0; i < cursor->image_count; i++)
-		wl_cursor_image_destroy(cursor->images[i]);
-
-	free(cursor->images);
-	free(cursor->name);
-	free(cursor);
-}
-
-static struct wl_cursor *
-wl_cursor_create_from_xcursor_images(XcursorImages *images,
-				     struct wl_cursor_theme *theme,
-                                     const char *name,
-                                     unsigned int load_size)
-{
-	struct cursor *cursor;
-	struct cursor_image *image;
-	int i, size;
-
-	cursor = malloc(sizeof *cursor);
-	if (!cursor)
-		return NULL;
-
-	cursor->cursor.images =
-		malloc(images->nimage * sizeof cursor->cursor.images[0]);
-	if (!cursor->cursor.images) {
-		free(cursor);
-		return NULL;
-	}
-
-	cursor->cursor.name = strdup(name);
-        cursor->cursor.size = load_size;
-	cursor->total_delay = 0;
-
-	for (i = 0; i < images->nimage; i++) {
-		image = malloc(sizeof *image);
-		if (image == NULL)
-			break;
-
-		image->theme = theme;
-		image->buffer = NULL;
-
-		image->image.width = images->images[i]->width;
-		image->image.height = images->images[i]->height;
-		image->image.hotspot_x = images->images[i]->xhot;
-		image->image.hotspot_y = images->images[i]->yhot;
-		image->image.delay = images->images[i]->delay;
-
-		size = image->image.width * image->image.height * 4;
-		image->offset = shm_pool_allocate(theme->pool, size);
-		if (image->offset < 0) {
-			free(image);
-			break;
-		}
-
-		/* copy pixels to shm pool */
-		memcpy(theme->pool->data + image->offset,
-		       images->images[i]->pixels, size);
-		cursor->total_delay += image->image.delay;
-		cursor->cursor.images[i] = (struct wl_cursor_image *) image;
-	}
-	cursor->cursor.image_count = i;
-
-	if (cursor->cursor.image_count == 0) {
-		free(cursor->cursor.name);
-		free(cursor->cursor.images);
-		free(cursor);
-		return NULL;
-	}
-
-	return &cursor->cursor;
-}
-
-static void
-load_cursor(struct wl_cursor_theme *theme, const char *name, unsigned int size)
-{
-        XcursorImages *images;
-	struct wl_cursor *cursor;
-        char *path;
-
-        path = g_strconcat (theme->path, "/", name, NULL);
-        images = xcursor_load_images (path, size);
-        g_free (path); 
-
-        if (!images)
-          return;
-
-        cursor = wl_cursor_create_from_xcursor_images(images, theme, name, size);
-
-	if (cursor) {
-		theme->cursor_count++;
-		theme->cursors =
-			realloc(theme->cursors,
-				theme->cursor_count * sizeof theme->cursors[0]);
-
-		if (theme->cursors == NULL) {
-			theme->cursor_count--;
-			free(cursor);
-		} else {
-			theme->cursors[theme->cursor_count - 1] = cursor;
-		}
-	}
-
-	xcursor_images_destroy (images);
-}
-
-/** Load a cursor theme to memory shared with the compositor
- *
- * \param name The name of the cursor theme to load. If %NULL, the default
- * theme will be loaded.
- * \param size Desired size of the cursor images.
- * \param shm The compositor's shm interface.
- *
- * \return An object representing the theme that should be destroyed with
- * wl_cursor_theme_destroy() or %NULL on error. If no theme with the given
- * name exists, a default theme will be loaded.
- */
-struct wl_cursor_theme *
-wl_cursor_theme_create(const char *path, int size, struct wl_shm *shm)
-{
-	struct wl_cursor_theme *theme;
-
-	theme = malloc(sizeof *theme);
-	if (!theme)
-		return NULL;
-
-	theme->path = strdup (path);
-	theme->size = size;
-	theme->cursor_count = 0;
-	theme->cursors = NULL;
-
-	theme->pool = shm_pool_create(shm, size * size * 4);
-	if (!theme->pool) {
-                free (theme->path);
-                free (theme);
-		return NULL;
-        }
-
-	return theme;
-}
-
-/** Destroys a cursor theme object
- *
- * \param theme The cursor theme to be destroyed
- */
-void
-wl_cursor_theme_destroy(struct wl_cursor_theme *theme)
-{
-	unsigned int i;
-
-	for (i = 0; i < theme->cursor_count; i++)
-		wl_cursor_destroy(theme->cursors[i]);
-
-	shm_pool_destroy(theme->pool);
-
-	free(theme->cursors);
-        free(theme->path);
-	free(theme);
-}
-
-/** Get the cursor for a given name from a cursor theme
- *
- * \param theme The cursor theme
- * \param name Name of the desired cursor
- * \return The theme's cursor of the given name or %NULL if there is no
- * such cursor
- */
-struct wl_cursor *
-wl_cursor_theme_get_cursor(struct wl_cursor_theme *theme,
-			   const char *name,
-                           unsigned int scale)
-{
-	unsigned int i;
-        unsigned int size;
-
-        size = theme->size * scale;
-
-	for (i = 0; i < theme->cursor_count; i++) {
-                if (size == theme->cursors[i]->size &&
-		    strcmp(name, theme->cursors[i]->name) == 0)
-		        return theme->cursors[i];
-        }
-
-        load_cursor (theme, name, size);
-
-        if (i < theme->cursor_count) {
-                if (size == theme->cursors[i]->size &&
-                    strcmp (name, theme->cursors[theme->cursor_count - 1]->name) == 0)
-                        return theme->cursors[theme->cursor_count - 1];
-        }
-
-	return NULL;
-}

gdk/wayland/cursor/wayland-cursor.h

@@ -1,72 +0,0 @@
-/*
- * Copyright © 2012 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef WAYLAND_CURSOR_H
-#define WAYLAND_CURSOR_H
-
-#include <stdint.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-struct wl_cursor_theme;
-struct wl_buffer;
-struct wl_shm;
-
-struct wl_cursor_image {
-	uint32_t width;		/* actual width */
-	uint32_t height;	/* actual height */
-	uint32_t hotspot_x;	/* hot spot x (must be inside image) */
-	uint32_t hotspot_y;	/* hot spot y (must be inside image) */
-	uint32_t delay;		/* animation delay to next frame (ms) */
-};
-
-struct wl_cursor {
-	unsigned int image_count;
-	struct wl_cursor_image **images;
-	char *name;
-        unsigned int size;
-};
-
-struct wl_cursor_theme *
-wl_cursor_theme_create(const char *name, int size, struct wl_shm *shm);
-
-void
-wl_cursor_theme_destroy(struct wl_cursor_theme *theme);
-
-struct wl_cursor *
-wl_cursor_theme_get_cursor(struct wl_cursor_theme *theme,
-			   const char *name,
-                           unsigned int scale);
-
-struct wl_buffer *
-wl_cursor_image_get_buffer(struct wl_cursor_image *image);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gdk/wayland/cursor/xcursor.c

@@ -1,612 +0,0 @@
-/*
- * Copyright © 2002 Keith Packard
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "xcursor.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dirent.h>
-
-/*
- * From libXcursor/include/X11/extensions/Xcursor.h
- */
-
-#define XcursorTrue	1
-#define XcursorFalse	0
-
-/*
- * Cursor files start with a header.  The header
- * contains a magic number, a version number and a
- * table of contents which has type and offset information
- * for the remaining tables in the file.
- *
- * File minor versions increment for compatible changes
- * File major versions increment for incompatible changes (never, we hope)
- *
- * Chunks of the same type are always upward compatible.  Incompatible
- * changes are made with new chunk types; the old data can remain under
- * the old type.  Upward compatible changes can add header data as the
- * header lengths are specified in the file.
- *
- *  File:
- *	FileHeader
- *	LISTofChunk
- *
- *  FileHeader:
- *	CARD32		magic	    magic number
- *	CARD32		header	    bytes in file header
- *	CARD32		version	    file version
- *	CARD32		ntoc	    number of toc entries
- *	LISTofFileToc   toc	    table of contents
- *
- *  FileToc:
- *	CARD32		type	    entry type
- *	CARD32		subtype	    entry subtype (size for images)
- *	CARD32		position    absolute file position
- */
-
-#define XCURSOR_MAGIC	0x72756358  /* "Xcur" LSBFirst */
-
-/*
- * Current Xcursor version number.  Will be substituted by configure
- * from the version in the libXcursor configure.ac file.
- */
-
-#define XCURSOR_LIB_MAJOR 1
-#define XCURSOR_LIB_MINOR 1
-#define XCURSOR_LIB_REVISION 13
-#define XCURSOR_LIB_VERSION	((XCURSOR_LIB_MAJOR * 10000) + \
-				 (XCURSOR_LIB_MINOR * 100) + \
-				 (XCURSOR_LIB_REVISION))
-
-/*
- * This version number is stored in cursor files; changes to the
- * file format require updating this version number
- */
-#define XCURSOR_FILE_MAJOR	1
-#define XCURSOR_FILE_MINOR	0
-#define XCURSOR_FILE_VERSION	((XCURSOR_FILE_MAJOR << 16) | (XCURSOR_FILE_MINOR))
-#define XCURSOR_FILE_HEADER_LEN	(4 * 4)
-#define XCURSOR_FILE_TOC_LEN	(3 * 4)
-
-typedef struct _XcursorFileToc {
-    XcursorUInt	    type;	/* chunk type */
-    XcursorUInt	    subtype;	/* subtype (size for images) */
-    XcursorUInt	    position;	/* absolute position in file */
-} XcursorFileToc;
-
-typedef struct _XcursorFileHeader {
-    XcursorUInt	    magic;	/* magic number */
-    XcursorUInt	    header;	/* byte length of header */
-    XcursorUInt	    version;	/* file version number */
-    XcursorUInt	    ntoc;	/* number of toc entries */
-    XcursorFileToc  *tocs;	/* table of contents */
-} XcursorFileHeader;
-
-/*
- * The rest of the file is a list of chunks, each tagged by type
- * and version.
- *
- *  Chunk:
- *	ChunkHeader
- *	<extra type-specific header fields>
- *	<type-specific data>
- *
- *  ChunkHeader:
- *	CARD32	    header	bytes in chunk header + type header
- *	CARD32	    type	chunk type
- *	CARD32	    subtype	chunk subtype
- *	CARD32	    version	chunk type version
- */
-
-#define XCURSOR_CHUNK_HEADER_LEN    (4 * 4)
-
-typedef struct _XcursorChunkHeader {
-    XcursorUInt	    header;	/* bytes in chunk header */
-    XcursorUInt	    type;	/* chunk type */
-    XcursorUInt	    subtype;	/* chunk subtype (size for images) */
-    XcursorUInt	    version;	/* version of this type */
-} XcursorChunkHeader;
-
-/*
- * Here's a list of the known chunk types
- */
-
-/*
- * Comments consist of a 4-byte length field followed by
- * UTF-8 encoded text
- *
- *  Comment:
- *	ChunkHeader header	chunk header
- *	CARD32	    length	bytes in text
- *	LISTofCARD8 text	UTF-8 encoded text
- */
-
-#define XCURSOR_COMMENT_TYPE	    0xfffe0001
-#define XCURSOR_COMMENT_VERSION	    1
-#define XCURSOR_COMMENT_HEADER_LEN  (XCURSOR_CHUNK_HEADER_LEN + (1 *4))
-#define XCURSOR_COMMENT_COPYRIGHT   1
-#define XCURSOR_COMMENT_LICENSE	    2
-#define XCURSOR_COMMENT_OTHER	    3
-#define XCURSOR_COMMENT_MAX_LEN	    0x100000
-
-typedef struct _XcursorComment {
-    XcursorUInt	    version;
-    XcursorUInt	    comment_type;
-    char	    *comment;
-} XcursorComment;
-
-/*
- * Each cursor image occupies a separate image chunk.
- * The length of the image header follows the chunk header
- * so that future versions can extend the header without
- * breaking older applications
- *
- *  Image:
- *	ChunkHeader	header	chunk header
- *	CARD32		width	actual width
- *	CARD32		height	actual height
- *	CARD32		xhot	hot spot x
- *	CARD32		yhot	hot spot y
- *	CARD32		delay	animation delay
- *	LISTofCARD32	pixels	ARGB pixels
- */
-
-#define XCURSOR_IMAGE_TYPE    	    0xfffd0002
-#define XCURSOR_IMAGE_VERSION	    1
-#define XCURSOR_IMAGE_HEADER_LEN    (XCURSOR_CHUNK_HEADER_LEN + (5*4))
-#define XCURSOR_IMAGE_MAX_SIZE	    0x7fff	/* 32767x32767 max cursor size */
-
-typedef struct _XcursorFile XcursorFile;
-
-struct _XcursorFile {
-    void    *closure;
-    int	    (*read)  (XcursorFile *file, unsigned char *buf, int len);
-    int	    (*write) (XcursorFile *file, unsigned char *buf, int len);
-    int	    (*seek)  (XcursorFile *file, long offset, int whence);
-};
-
-typedef struct _XcursorComments {
-    int		    ncomment;	/* number of comments */
-    XcursorComment  **comments;	/* array of XcursorComment pointers */
-} XcursorComments;
-
-/*
- * From libXcursor/src/file.c
- */
-
-static XcursorImage *
-XcursorImageCreate (int width, int height)
-{
-    XcursorImage    *image;
-
-    if (width < 0 || height < 0)
-       return NULL;
-    if (width > XCURSOR_IMAGE_MAX_SIZE || height > XCURSOR_IMAGE_MAX_SIZE)
-       return NULL;
-
-    image = malloc (sizeof (XcursorImage) +
-		    width * height * sizeof (XcursorPixel));
-    if (!image)
-	return NULL;
-    image->version = XCURSOR_IMAGE_VERSION;
-    image->pixels = (XcursorPixel *) (image + 1);
-    image->size = width > height ? width : height;
-    image->width = width;
-    image->height = height;
-    image->delay = 0;
-    return image;
-}
-
-static void
-XcursorImageDestroy (XcursorImage *image)
-{
-    free (image);
-}
-
-static XcursorImages *
-XcursorImagesCreate (int size)
-{
-    XcursorImages   *images;
-
-    images = malloc (sizeof (XcursorImages) +
-		     size * sizeof (XcursorImage *));
-    if (!images)
-	return NULL;
-    images->nimage = 0;
-    images->images = (XcursorImage **) (images + 1);
-    images->name = NULL;
-    return images;
-}
-
-static void
-XcursorImagesDestroy (XcursorImages *images)
-{
-    int	n;
-
-    if (!images)
-        return;
-
-    for (n = 0; n < images->nimage; n++)
-	XcursorImageDestroy (images->images[n]);
-    if (images->name)
-	free (images->name);
-    free (images);
-}
-
-static XcursorBool
-_XcursorReadUInt (XcursorFile *file, XcursorUInt *u)
-{
-    unsigned char   bytes[4];
-
-    if (!file || !u)
-        return XcursorFalse;
-
-    if ((*file->read) (file, bytes, 4) != 4)
-	return XcursorFalse;
-    *u = ((bytes[0] << 0) |
-	  (bytes[1] << 8) |
-	  (bytes[2] << 16) |
-	  (bytes[3] << 24));
-    return XcursorTrue;
-}
-
-static void
-_XcursorFileHeaderDestroy (XcursorFileHeader *fileHeader)
-{
-    free (fileHeader);
-}
-
-static XcursorFileHeader *
-_XcursorFileHeaderCreate (int ntoc)
-{
-    XcursorFileHeader	*fileHeader;
-
-    if (ntoc > 0x10000)
-	return NULL;
-    fileHeader = malloc (sizeof (XcursorFileHeader) +
-			 ntoc * sizeof (XcursorFileToc));
-    if (!fileHeader)
-	return NULL;
-    fileHeader->magic = XCURSOR_MAGIC;
-    fileHeader->header = XCURSOR_FILE_HEADER_LEN;
-    fileHeader->version = XCURSOR_FILE_VERSION;
-    fileHeader->ntoc = ntoc;
-    fileHeader->tocs = (XcursorFileToc *) (fileHeader + 1);
-    return fileHeader;
-}
-
-static XcursorFileHeader *
-_XcursorReadFileHeader (XcursorFile *file)
-{
-    XcursorFileHeader	head, *fileHeader;
-    XcursorUInt		skip;
-    unsigned int	n;
-
-    if (!file)
-        return NULL;
-
-    if (!_XcursorReadUInt (file, &head.magic))
-	return NULL;
-    if (head.magic != XCURSOR_MAGIC)
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.header))
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.version))
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.ntoc))
-	return NULL;
-    skip = head.header - XCURSOR_FILE_HEADER_LEN;
-    if (skip)
-	if ((*file->seek) (file, skip, SEEK_CUR) == EOF)
-	    return NULL;
-    fileHeader = _XcursorFileHeaderCreate (head.ntoc);
-    if (!fileHeader)
-	return NULL;
-    fileHeader->magic = head.magic;
-    fileHeader->header = head.header;
-    fileHeader->version = head.version;
-    fileHeader->ntoc = head.ntoc;
-    for (n = 0; n < fileHeader->ntoc; n++)
-    {
-	if (!_XcursorReadUInt (file, &fileHeader->tocs[n].type))
-	    break;
-	if (!_XcursorReadUInt (file, &fileHeader->tocs[n].subtype))
-	    break;
-	if (!_XcursorReadUInt (file, &fileHeader->tocs[n].position))
-	    break;
-    }
-    if (n != fileHeader->ntoc)
-    {
-	_XcursorFileHeaderDestroy (fileHeader);
-	return NULL;
-    }
-    return fileHeader;
-}
-
-static XcursorBool
-_XcursorSeekToToc (XcursorFile		*file,
-		   XcursorFileHeader	*fileHeader,
-		   int			toc)
-{
-    if (!file || !fileHeader || \
-        (*file->seek) (file, fileHeader->tocs[toc].position, SEEK_SET) == EOF)
-	return XcursorFalse;
-    return XcursorTrue;
-}
-
-static XcursorBool
-_XcursorFileReadChunkHeader (XcursorFile	*file,
-			     XcursorFileHeader	*fileHeader,
-			     int		toc,
-			     XcursorChunkHeader	*chunkHeader)
-{
-    if (!file || !fileHeader || !chunkHeader)
-        return XcursorFalse;
-    if (!_XcursorSeekToToc (file, fileHeader, toc))
-	return XcursorFalse;
-    if (!_XcursorReadUInt (file, &chunkHeader->header))
-	return XcursorFalse;
-    if (!_XcursorReadUInt (file, &chunkHeader->type))
-	return XcursorFalse;
-    if (!_XcursorReadUInt (file, &chunkHeader->subtype))
-	return XcursorFalse;
-    if (!_XcursorReadUInt (file, &chunkHeader->version))
-	return XcursorFalse;
-    /* sanity check */
-    if (chunkHeader->type != fileHeader->tocs[toc].type ||
-	chunkHeader->subtype != fileHeader->tocs[toc].subtype)
-	return XcursorFalse;
-    return XcursorTrue;
-}
-
-#define dist(a,b)   ((a) > (b) ? (a) - (b) : (b) - (a))
-
-static XcursorDim
-_XcursorFindBestSize (XcursorFileHeader *fileHeader,
-		      XcursorDim	size,
-		      int		*nsizesp)
-{
-    unsigned int n;
-    int		nsizes = 0;
-    XcursorDim	bestSize = 0;
-    XcursorDim	thisSize;
-
-    if (!fileHeader || !nsizesp)
-        return 0;
-
-    for (n = 0; n < fileHeader->ntoc; n++)
-    {
-	if (fileHeader->tocs[n].type != XCURSOR_IMAGE_TYPE)
-	    continue;
-	thisSize = fileHeader->tocs[n].subtype;
-	if (!bestSize || dist (thisSize, size) < dist (bestSize, size))
-	{
-	    bestSize = thisSize;
-	    nsizes = 1;
-	}
-	else if (thisSize == bestSize)
-	    nsizes++;
-    }
-    *nsizesp = nsizes;
-    return bestSize;
-}
-
-static int
-_XcursorFindImageToc (XcursorFileHeader	*fileHeader,
-		      XcursorDim	size,
-		      int		count)
-{
-    unsigned int	toc;
-    XcursorDim		thisSize;
-
-    if (!fileHeader)
-        return 0;
-
-    for (toc = 0; toc < fileHeader->ntoc; toc++)
-    {
-	if (fileHeader->tocs[toc].type != XCURSOR_IMAGE_TYPE)
-	    continue;
-	thisSize = fileHeader->tocs[toc].subtype;
-	if (thisSize != size)
-	    continue;
-	if (!count)
-	    break;
-	count--;
-    }
-    if (toc == fileHeader->ntoc)
-	return -1;
-    return toc;
-}
-
-static XcursorImage *
-_XcursorReadImage (XcursorFile		*file,
-		   XcursorFileHeader	*fileHeader,
-		   int			toc)
-{
-    XcursorChunkHeader	chunkHeader;
-    XcursorImage	head;
-    XcursorImage	*image;
-    int			n;
-    XcursorPixel	*p;
-
-    if (!file || !fileHeader)
-        return NULL;
-
-    if (!_XcursorFileReadChunkHeader (file, fileHeader, toc, &chunkHeader))
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.width))
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.height))
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.xhot))
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.yhot))
-	return NULL;
-    if (!_XcursorReadUInt (file, &head.delay))
-	return NULL;
-    /* sanity check data */
-    if (head.width > XCURSOR_IMAGE_MAX_SIZE  ||
-	head.height > XCURSOR_IMAGE_MAX_SIZE)
-	return NULL;
-    if (head.width == 0 || head.height == 0)
-	return NULL;
-    if (head.xhot > head.width || head.yhot > head.height)
-	return NULL;
-
-    /* Create the image and initialize it */
-    image = XcursorImageCreate (head.width, head.height);
-    if (image == NULL)
-	    return NULL;
-    if (chunkHeader.version < image->version)
-	image->version = chunkHeader.version;
-    image->size = chunkHeader.subtype;
-    image->xhot = head.xhot;
-    image->yhot = head.yhot;
-    image->delay = head.delay;
-    n = image->width * image->height;
-    p = image->pixels;
-    while (n--)
-    {
-	if (!_XcursorReadUInt (file, p))
-	{
-	    XcursorImageDestroy (image);
-	    return NULL;
-	}
-	p++;
-    }
-    return image;
-}
-
-static XcursorImages *
-XcursorXcFileLoadImages (XcursorFile *file, int size)
-{
-    XcursorFileHeader	*fileHeader;
-    XcursorDim		bestSize;
-    int			nsize;
-    XcursorImages	*images;
-    int			n;
-    int			toc;
-
-    if (!file || size < 0)
-	return NULL;
-    fileHeader = _XcursorReadFileHeader (file);
-    if (!fileHeader)
-	return NULL;
-    bestSize = _XcursorFindBestSize (fileHeader, (XcursorDim) size, &nsize);
-    if (!bestSize)
-    {
-        _XcursorFileHeaderDestroy (fileHeader);
-	return NULL;
-    }
-    images = XcursorImagesCreate (nsize);
-    if (!images)
-    {
-        _XcursorFileHeaderDestroy (fileHeader);
-	return NULL;
-    }
-    for (n = 0; n < nsize; n++)
-    {
-	toc = _XcursorFindImageToc (fileHeader, bestSize, n);
-	if (toc < 0)
-	    break;
-	images->images[images->nimage] = _XcursorReadImage (file, fileHeader,
-							    toc);
-	if (!images->images[images->nimage])
-	    break;
-	images->nimage++;
-    }
-    _XcursorFileHeaderDestroy (fileHeader);
-    if (images->nimage != nsize)
-    {
-	XcursorImagesDestroy (images);
-	images = NULL;
-    }
-    return images;
-}
-
-static int
-_XcursorStdioFileRead (XcursorFile *file, unsigned char *buf, int len)
-{
-    FILE    *f = file->closure;
-    return fread (buf, 1, len, f);
-}
-
-static int
-_XcursorStdioFileWrite (XcursorFile *file, unsigned char *buf, int len)
-{
-    FILE    *f = file->closure;
-    return fwrite (buf, 1, len, f);
-}
-
-static int
-_XcursorStdioFileSeek (XcursorFile *file, long offset, int whence)
-{
-    FILE    *f = file->closure;
-    return fseek (f, offset, whence);
-}
-
-static void
-_XcursorStdioFileInitialize (FILE *stdfile, XcursorFile *file)
-{
-    file->closure = stdfile;
-    file->read = _XcursorStdioFileRead;
-    file->write = _XcursorStdioFileWrite;
-    file->seek = _XcursorStdioFileSeek;
-}
-
-static XcursorImages *
-XcursorFileLoadImages (FILE *file, int size)
-{
-    XcursorFile	f;
-
-    if (!file)
-        return NULL;
-
-    _XcursorStdioFileInitialize (file, &f);
-    return XcursorXcFileLoadImages (&f, size);
-}
-
-XcursorImages *
-xcursor_load_images (const char *path, int size)
-{
-  FILE    *f;
-  XcursorImages *images;
-
-  f = fopen (path, "r");
-  if (!f)
-    return NULL;
-
-  images = XcursorFileLoadImages (f, size);
-  fclose (f);
-
-  return images;
-}
-
-void
-xcursor_images_destroy (XcursorImages *images)
-{
-  XcursorImagesDestroy (images);
-}

gdk/wayland/cursor/xcursor.h

@@ -1,61 +0,0 @@
-/*
- * Copyright © 2002 Keith Packard
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef XCURSOR_H
-#define XCURSOR_H
-
-typedef int		XcursorBool;
-typedef unsigned int	XcursorUInt;
-
-typedef XcursorUInt	XcursorDim;
-typedef XcursorUInt	XcursorPixel;
-
-typedef struct _XcursorImage {
-    XcursorUInt	    version;	/* version of the image data */
-    XcursorDim	    size;	/* nominal size for matching */
-    XcursorDim	    width;	/* actual width */
-    XcursorDim	    height;	/* actual height */
-    XcursorDim	    xhot;	/* hot spot x (must be inside image) */
-    XcursorDim	    yhot;	/* hot spot y (must be inside image) */
-    XcursorUInt	    delay;	/* animation delay to next frame (ms) */
-    XcursorPixel    *pixels;	/* pointer to pixels */
-} XcursorImage;
-
-/*
- * Other data structures exposed by the library API
- */
-typedef struct _XcursorImages {
-    int		    nimage;	/* number of images */
-    XcursorImage    **images;	/* array of XcursorImage pointers */
-    char	    *name;	/* name used to load images */
-} XcursorImages;
-
-void
-xcursor_images_destroy (XcursorImages *images);
-
-XcursorImages *
-xcursor_load_images (const char *path, int size);
-
-#endif

gdk/wayland/gdkcursor-wayland.c

@@ -33,7 +33,8 @@
 #include "gdkdisplay-wayland.h"
 #include "gdkwayland.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "cursor/wayland-cursor.h"
+
+#include <wayland-cursor.h>
 
 static void
 gdk_wayland_cursor_remove_from_cache (gpointer data, GObject *cursor)
@@ -118,12 +119,11 @@ name_fallback (const gchar *name)
 static struct wl_cursor *
 gdk_wayland_cursor_load_for_name (GdkWaylandDisplay      *display_wayland,
                                   struct wl_cursor_theme *theme,
-                                  int                     scale,
                                   const char             *name)
 {
   struct wl_cursor *c;
 
-  c = wl_cursor_theme_get_cursor (theme, name, scale);
+  c = wl_cursor_theme_get_cursor (theme, name);
   if (!c)
     {
       const char *fallback;
@@ -131,7 +131,7 @@ gdk_wayland_cursor_load_for_name (GdkWaylandDisplay      *display_wayland,
       fallback = name_fallback (name);
       if (fallback)
         {
-          c = wl_cursor_theme_get_cursor (theme, fallback, scale);
+          c = wl_cursor_theme_get_cursor (theme, fallback);
         }
     }
 
@@ -172,8 +172,7 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
         goto none;
 
       c = gdk_wayland_cursor_load_for_name (display,
-                                            _gdk_wayland_display_get_cursor_theme (display),
-                                            desired_scale,
+                                            _gdk_wayland_display_get_scaled_cursor_theme (display, desired_scale),
                                             gdk_cursor_get_name (cursor));
       if (c)
         {
@@ -271,8 +270,7 @@ _gdk_wayland_cursor_get_next_image_index (GdkWaylandDisplay *display,
     }
 
   c = gdk_wayland_cursor_load_for_name (display,
-                                        _gdk_wayland_display_get_cursor_theme (display),
-                                        scale,
+                                        _gdk_wayland_display_get_scaled_cursor_theme (display, scale),
                                         gdk_cursor_get_name (cursor));
 
   if (c)

gdk/wayland/gdkdevice-wayland.c

@@ -56,8 +56,6 @@
 #define BTN_STYLUS3 0x149 /* Linux 4.15 */
 #endif
 
-#define GDK_SEAT_NOTE(seat,type,action) GDK_DISPLAY_NOTE(gdk_seat_get_display (GDK_SEAT (seat)),type,action)
-
 typedef struct _GdkWaylandDevicePad GdkWaylandDevicePad;
 typedef struct _GdkWaylandDevicePadClass GdkWaylandDevicePadClass;
 
@@ -1121,7 +1119,7 @@ data_offer_offer (void                 *data,
 
   if (seat->pending_offer != offer)
     {
-      GDK_SEAT_NOTE (seat, EVENTS,
+      GDK_DISPLAY_NOTE (gdk_seat_get_display (GDK_SEAT (seat)), EVENTS,
                         g_message ("%p: offer for unknown offer %p of %s",
                                    seat, offer, type));
       return;
@@ -1193,7 +1191,7 @@ data_device_data_offer (void                  *data,
 {
   GdkWaylandSeat *seat = data;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("data device data offer, data device %p, offer %p",
                        data_device, offer));
 
@@ -1230,13 +1228,13 @@ data_device_enter (void                  *data,
 
   if (offer != seat->pending_offer)
     {
-      GDK_SEAT_NOTE (seat, EVENTS,
+      GDK_DISPLAY_NOTE (gdk_seat_get_display (GDK_SEAT (seat)), EVENTS,
                         g_message ("%p: enter event for unknown offer %p, expected %p",
                                    seat, offer, seat->pending_offer));
       return;
     }
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("data device enter, data device %p serial %u, surface %p, x %f y %f, offer %p",
                        data_device, serial, surface, wl_fixed_to_double (x), wl_fixed_to_double (y), offer));
 
@@ -1276,7 +1274,7 @@ data_device_leave (void                  *data,
 {
   GdkWaylandSeat *seat = data;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("data device leave, data device %p", data_device));
 
   if (seat->drop == NULL)
@@ -1302,7 +1300,7 @@ data_device_motion (void                  *data,
   GdkWaylandSeat *seat = data;
   int origin_x, origin_y;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("data device motion, data_device = %p, time = %d, x = %f, y = %f",
                        data_device, time, wl_fixed_to_double (x), wl_fixed_to_double (y)));
 
@@ -1329,7 +1327,7 @@ data_device_drop (void                  *data,
   GdkWaylandSeat *seat = data;
   int origin_x, origin_y;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("data device drop, data device %p", data_device));
 
   gdk_surface_get_origin (gdk_drop_get_surface (seat->drop), &origin_x, &origin_y);
@@ -1575,7 +1573,7 @@ pointer_handle_enter (void              *data,
                    &event->crossing.x_root,
                    &event->crossing.y_root);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("enter, seat %p surface %p",
                        seat, seat->pointer_info.focus));
 
@@ -1623,7 +1621,7 @@ pointer_handle_leave (void              *data,
                    &event->crossing.x_root,
                    &event->crossing.y_root);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("leave, seat %p surface %p",
                        seat, seat->pointer_info.focus));
 
@@ -1669,7 +1667,7 @@ pointer_handle_motion (void              *data,
                    &event->motion.x_root,
                    &event->motion.y_root);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("motion %f %f, seat %p state %d",
                        wl_fixed_to_double (sx), wl_fixed_to_double (sy),
 		       seat, event->motion.state));
@@ -1742,7 +1740,7 @@ pointer_handle_button (void              *data,
   else
     seat->pointer_info.button_modifiers &= ~modifier;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
 	    g_message ("button %d %s, seat %p state %d",
 		       event->button.button,
 		       state ? "press" : "release",
@@ -1800,7 +1798,7 @@ pointer_handle_axis (void              *data,
 
   seat->pointer_info.time = time;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("scroll, axis %s, value %f, seat %p",
                        get_axis_name (axis), wl_fixed_to_double (value) / 10.0,
                        seat));
@@ -1815,7 +1813,7 @@ pointer_handle_frame (void              *data,
 {
   GdkWaylandSeat *seat = data;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("frame, seat %p", seat));
 
   gdk_wayland_seat_flush_frame_event (seat);
@@ -1856,7 +1854,7 @@ pointer_handle_axis_source (void                        *data,
 
   pointer_frame->source = source;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("axis source %s, seat %p", get_axis_source_name (source), seat));
 }
 
@@ -1888,7 +1886,7 @@ pointer_handle_axis_stop (void              *data,
 
   pointer_frame->is_scroll_stop = TRUE;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("axis %s stop, seat %p", get_axis_name (axis), seat));
 }
 
@@ -1916,7 +1914,7 @@ pointer_handle_axis_discrete (void              *data,
       g_return_if_reached ();
     }
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("discrete scroll, axis %s, value %d, seat %p",
                        get_axis_name (axis), value, seat));
 }
@@ -1972,7 +1970,7 @@ keyboard_handle_enter (void               *data,
   gdk_event_set_device (event, seat->master_keyboard);
   gdk_event_set_source_device (event, seat->keyboard);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("focus in, seat %p surface %p",
                        seat, seat->keyboard_focus));
 
@@ -2013,7 +2011,7 @@ keyboard_handle_leave (void               *data,
   seat->keyboard_focus = NULL;
   seat->repeat_key = 0;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("focus out, seat %p surface %p",
                        seat, event->any.surface));
 
@@ -2108,7 +2106,7 @@ deliver_key_event (GdkWaylandSeat *seat,
 
   _gdk_wayland_display_deliver_event (seat->display, event);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("keyboard %s event%s, surface %p, code %d, sym %d, "
                        "mods 0x%x",
                        (state ? "press" : "release"),
@@ -2396,7 +2394,7 @@ touch_handle_down (void              *data,
       mimic_pointer_emulating_touch_info (seat->touch_master, touch);
     }
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("touch begin %f %f", event->touch.x, event->touch.y));
 
   _gdk_wayland_display_deliver_event (seat->display, event);
@@ -2419,7 +2417,7 @@ touch_handle_up (void            *data,
   touch = gdk_wayland_seat_get_touch (seat, id);
   event = _create_touch_event (seat, touch, GDK_TOUCH_END, time);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("touch end %f %f", event->touch.x, event->touch.y));
 
   _gdk_wayland_display_deliver_event (seat->display, event);
@@ -2451,7 +2449,7 @@ touch_handle_motion (void            *data,
 
   event = _create_touch_event (seat, touch, GDK_TOUCH_UPDATE, time);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("touch update %f %f", event->touch.x, event->touch.y));
 
   _gdk_wayland_display_deliver_event (seat->display, event);
@@ -2488,7 +2486,7 @@ touch_handle_cancel (void            *data,
       g_hash_table_iter_remove (&iter);
     }
 
-  GDK_SEAT_NOTE (wayland_seat, EVENTS, g_message ("touch cancel"));
+  GDK_DISPLAY_NOTE (wayland_seat->display, EVENTS, g_message ("touch cancel"));
 }
 
 static void
@@ -2524,7 +2522,7 @@ emit_gesture_swipe_event (GdkWaylandSeat          *seat,
                    &event->touchpad_swipe.x_root,
                    &event->touchpad_swipe.y_root);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("swipe event %d, coords: %f %f, seat %p state %d",
                        event->any.type, event->touchpad_swipe.x,
                        event->touchpad_swipe.y, seat,
@@ -2627,7 +2625,7 @@ emit_gesture_pinch_event (GdkWaylandSeat          *seat,
                    &event->touchpad_pinch.x_root,
                    &event->touchpad_pinch.y_root);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("pinch event %d, coords: %f %f, seat %p state %d",
                        event->any.type, event->touchpad_pinch.x,
                        event->touchpad_pinch.y, seat,
@@ -2953,7 +2951,7 @@ seat_handle_capabilities (void                    *data,
   GdkWaylandSeat *seat = data;
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (seat->display);
 
-  GDK_SEAT_NOTE (seat, MISC,
+  GDK_DISPLAY_NOTE (seat->display, MISC,
             g_message ("seat %p with %s%s%s", wl_seat,
                        (caps & WL_SEAT_CAPABILITY_POINTER) ? " pointer, " : "",
                        (caps & WL_SEAT_CAPABILITY_KEYBOARD) ? " keyboard, " : "",
@@ -3176,7 +3174,7 @@ seat_handle_name (void           *data,
                   const char     *name)
 {
   /* We don't care about the name. */
-  GDK_SEAT_NOTE (GDK_WAYLAND_SEAT (data), MISC,
+  GDK_DISPLAY_NOTE (GDK_WAYLAND_SEAT (data)->display, MISC,
             g_message ("seat %p name %s", seat, name));
 }
 
@@ -3490,7 +3488,7 @@ tablet_tool_handle_proximity_in (void                      *data,
                     gdk_wayland_surface_get_wl_output (surface));
   pointer_surface_update_scale (tablet->master);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("proximity in, seat %p surface %p tool %d",
                        seat, tablet->pointer_info.focus,
                        gdk_device_tool_get_tool_type (tool->tool)));
@@ -3502,10 +3500,11 @@ tablet_tool_handle_proximity_out (void                      *data,
 {
   GdkWaylandTabletToolData *tool = data;
   GdkWaylandTabletData *tablet = tool->current_tablet;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tool->seat);
   GdkEvent *event;
 
-  GDK_SEAT_NOTE (tool->seat, EVENTS,
-            g_message ("proximity out, seat %p, tool %d", tool->seat,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
+            g_message ("proximity out, seat %p, tool %d", seat,
                        gdk_device_tool_get_tool_type (tool->tool)));
 
   event = gdk_wayland_tablet_get_frame_event (tablet, GDK_PROXIMITY_OUT);
@@ -3601,7 +3600,7 @@ tablet_tool_handle_motion (void                      *data,
   tablet->pointer_info.surface_x = wl_fixed_to_double (sx);
   tablet->pointer_info.surface_y = wl_fixed_to_double (sy);
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet motion %f %f",
                        tablet->pointer_info.surface_x,
                        tablet->pointer_info.surface_y));
@@ -3634,7 +3633,7 @@ tablet_tool_handle_pressure (void                      *data,
   _gdk_device_translate_axis (tablet->current_device, axis_index,
                               pressure, &tablet->axes[axis_index]);
 
-  GDK_SEAT_NOTE (tool->seat, EVENTS,
+  GDK_DISPLAY_NOTE (GDK_WAYLAND_SEAT (tool->seat)->display, EVENTS,
             g_message ("tablet tool %d pressure %d",
                        gdk_device_tool_get_tool_type (tool->tool), pressure));
 }
@@ -3651,7 +3650,7 @@ tablet_tool_handle_distance (void                      *data,
   _gdk_device_translate_axis (tablet->current_device, axis_index,
                               distance, &tablet->axes[axis_index]);
 
-  GDK_SEAT_NOTE (tool->seat, EVENTS,
+  GDK_DISPLAY_NOTE (GDK_WAYLAND_SEAT (tool->seat)->display, EVENTS,
             g_message ("tablet tool %d distance %d",
                        gdk_device_tool_get_tool_type (tool->tool), distance));
 }
@@ -3674,7 +3673,7 @@ tablet_tool_handle_tilt (void                      *data,
                               wl_fixed_to_double (ytilt),
                               &tablet->axes[ytilt_axis_index]);
 
-  GDK_SEAT_NOTE (tool->seat, EVENTS,
+  GDK_DISPLAY_NOTE (GDK_WAYLAND_SEAT (tool->seat)->display, EVENTS,
             g_message ("tablet tool %d tilt %f/%f",
                        gdk_device_tool_get_tool_type (tool->tool),
                        wl_fixed_to_double (xtilt), wl_fixed_to_double (ytilt)));
@@ -3729,7 +3728,7 @@ tablet_tool_handle_rotation (void                      *data,
                               wl_fixed_to_double (degrees),
                               &tablet->axes[axis_index]);
 
-  GDK_SEAT_NOTE (tool->seat, EVENTS,
+  GDK_DISPLAY_NOTE (GDK_WAYLAND_SEAT (tool->seat)->display, EVENTS,
             g_message ("tablet tool %d rotation %f",
                        gdk_device_tool_get_tool_type (tool->tool),
                        wl_fixed_to_double (degrees)));
@@ -3747,7 +3746,7 @@ tablet_tool_handle_slider (void                      *data,
   _gdk_device_translate_axis (tablet->current_device, axis_index,
                               position, &tablet->axes[axis_index]);
 
-  GDK_SEAT_NOTE (tool->seat, EVENTS,
+  GDK_DISPLAY_NOTE (GDK_WAYLAND_SEAT (tool->seat)->display, EVENTS,
             g_message ("tablet tool %d slider %d",
                        gdk_device_tool_get_tool_type (tool->tool), position));
 }
@@ -3763,7 +3762,7 @@ tablet_tool_handle_wheel (void                      *data,
   GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tablet->seat);
   GdkEvent *event;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet tool %d wheel %d/%d",
                        gdk_device_tool_get_tool_type (tool->tool), degrees, clicks));
 
@@ -3793,9 +3792,10 @@ tablet_tool_handle_frame (void                      *data,
 {
   GdkWaylandTabletToolData *tool = data;
   GdkWaylandTabletData *tablet = tool->current_tablet;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tablet->seat);
   GdkEvent *frame_event;
 
-  GDK_SEAT_NOTE (tablet->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet frame, time %d", time));
 
   frame_event = tablet->pointer_info.frame.event;
@@ -3838,8 +3838,10 @@ tablet_pad_ring_handle_source (void                          *data,
                                uint32_t                       source)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad ring handle source, ring = %p source = %d",
                        wp_tablet_pad_ring, source));
 
@@ -3852,8 +3854,10 @@ tablet_pad_ring_handle_angle (void                          *data,
                               wl_fixed_t                     angle)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad ring handle angle, ring = %p angle = %f",
                        wp_tablet_pad_ring, wl_fixed_to_double (angle)));
 
@@ -3865,8 +3869,10 @@ tablet_pad_ring_handle_stop (void                          *data,
                              struct zwp_tablet_pad_ring_v2 *wp_tablet_pad_ring)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad ring handle stop, ring = %p", wp_tablet_pad_ring));
 
   group->axis_tmp_info.is_stop = TRUE;
@@ -3882,7 +3888,7 @@ tablet_pad_ring_handle_frame (void                          *data,
   GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
   GdkEvent *event;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad ring handle frame, ring = %p", wp_tablet_pad_ring));
 
   event = gdk_event_new (GDK_PAD_RING);
@@ -3912,8 +3918,10 @@ tablet_pad_strip_handle_source (void                           *data,
                                 uint32_t                        source)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad strip handle source, strip = %p source = %d",
                        wp_tablet_pad_strip, source));
 
@@ -3926,8 +3934,10 @@ tablet_pad_strip_handle_position (void                           *data,
                                   uint32_t                        position)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad strip handle position, strip = %p position = %d",
                        wp_tablet_pad_strip, position));
 
@@ -3939,8 +3949,10 @@ tablet_pad_strip_handle_stop (void                           *data,
                               struct zwp_tablet_pad_strip_v2 *wp_tablet_pad_strip)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad strip handle stop, strip = %p",
                        wp_tablet_pad_strip));
 
@@ -3957,7 +3969,7 @@ tablet_pad_strip_handle_frame (void                           *data,
   GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
   GdkEvent *event;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad strip handle frame, strip = %p",
                        wp_tablet_pad_strip));
 
@@ -3989,9 +4001,11 @@ tablet_pad_group_handle_buttons (void                           *data,
                                  struct wl_array                *buttons)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
   uint32_t *p;
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad group handle buttons, pad group = %p, n_buttons = %" G_GSIZE_FORMAT,
                        wp_tablet_pad_group, buttons->size));
 
@@ -4009,8 +4023,10 @@ tablet_pad_group_handle_ring (void                           *data,
                               struct zwp_tablet_pad_ring_v2  *wp_tablet_pad_ring)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad group handle ring, pad group = %p, ring = %p",
                        wp_tablet_pad_group, wp_tablet_pad_ring));
 
@@ -4028,8 +4044,10 @@ tablet_pad_group_handle_strip (void                           *data,
                                struct zwp_tablet_pad_strip_v2 *wp_tablet_pad_strip)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad group handle strip, pad group = %p, strip = %p",
                        wp_tablet_pad_group, wp_tablet_pad_strip));
 
@@ -4047,8 +4065,10 @@ tablet_pad_group_handle_modes (void                           *data,
                                uint32_t                        modes)
 {
   GdkWaylandTabletPadGroupData *group = data;
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad group handle modes, pad group = %p, n_modes = %d",
                        wp_tablet_pad_group, modes));
 
@@ -4059,11 +4079,11 @@ static void
 tablet_pad_group_handle_done (void                           *data,
                               struct zwp_tablet_pad_group_v2 *wp_tablet_pad_group)
 {
-#ifdef G_ENABLE_DEBUG
   GdkWaylandTabletPadGroupData *group = data;
-#endif
+  GdkWaylandTabletPadData *pad = group->pad;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (group->pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad group handle done, pad group = %p",
                        wp_tablet_pad_group));
 }
@@ -4081,7 +4101,7 @@ tablet_pad_group_handle_mode (void                           *data,
   GdkEvent *event;
   guint n_group;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad group handle mode, pad group = %p, mode = %d",
                        wp_tablet_pad_group, mode));
 
@@ -4117,8 +4137,9 @@ tablet_pad_handle_group (void                           *data,
 {
   GdkWaylandTabletPadData *pad = data;
   GdkWaylandTabletPadGroupData *group;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle group, pad group = %p, group = %p",
                        wp_tablet_pad_group, wp_tablet_pad_group));
 
@@ -4138,8 +4159,9 @@ tablet_pad_handle_path (void                     *data,
                         const char               *path)
 {
   GdkWaylandTabletPadData *pad = data;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle path, pad = %p, path = %s",
                        wp_tablet_pad, path));
 
@@ -4152,8 +4174,9 @@ tablet_pad_handle_buttons (void                     *data,
                            uint32_t                  buttons)
 {
   GdkWaylandTabletPadData *pad = data;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle buttons, pad = %p, n_buttons = %d",
                        wp_tablet_pad, buttons));
 
@@ -4165,8 +4188,9 @@ tablet_pad_handle_done (void                     *data,
                         struct zwp_tablet_pad_v2 *wp_tablet_pad)
 {
   GdkWaylandTabletPadData *pad = data;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle done, pad = %p", wp_tablet_pad));
 
   pad->device =
@@ -4176,11 +4200,11 @@ tablet_pad_handle_done (void                     *data,
                   "input-source", GDK_SOURCE_TABLET_PAD,
                   "input-mode", GDK_MODE_SCREEN,
                   "display", gdk_seat_get_display (pad->seat),
-                  "seat", pad->seat,
+                  "seat", seat,
                   NULL);
 
-  _gdk_device_set_associated_device (pad->device, GDK_WAYLAND_SEAT (pad->seat)->master_keyboard);
-  gdk_seat_device_added (GDK_SEAT (pad->seat), pad->device);
+  _gdk_device_set_associated_device (pad->device, seat->master_keyboard);
+  gdk_seat_device_added (GDK_SEAT (seat), pad->device);
 }
 
 static void
@@ -4192,10 +4216,11 @@ tablet_pad_handle_button (void                     *data,
 {
   GdkWaylandTabletPadData *pad = data;
   GdkWaylandTabletPadGroupData *group;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
   GdkEvent *event;
   gint n_group;
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle button, pad = %p, button = %d, state = %d",
                        wp_tablet_pad, button, state));
 
@@ -4205,7 +4230,7 @@ tablet_pad_handle_button (void                     *data,
   event = gdk_event_new (state == ZWP_TABLET_PAD_V2_BUTTON_STATE_PRESSED ?
                          GDK_PAD_BUTTON_PRESS :
                          GDK_PAD_BUTTON_RELEASE);
-  g_set_object (&event->any.surface, GDK_WAYLAND_SEAT (pad->seat)->keyboard_focus);
+  g_set_object (&event->any.surface, seat->keyboard_focus);
   event->pad_button.button = button;
   event->pad_button.group = n_group;
   event->pad_button.mode = group->current_mode;
@@ -4213,7 +4238,8 @@ tablet_pad_handle_button (void                     *data,
   gdk_event_set_device (event, pad->device);
   gdk_event_set_source_device (event, pad->device);
 
-  _gdk_wayland_display_deliver_event (gdk_seat_get_display (pad->seat), event);
+  _gdk_wayland_display_deliver_event (gdk_seat_get_display (pad->seat),
+                                      event);
 }
 
 static void
@@ -4224,9 +4250,10 @@ tablet_pad_handle_enter (void                     *data,
                          struct wl_surface        *surface)
 {
   GdkWaylandTabletPadData *pad = data;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
   GdkWaylandTabletData *tablet = zwp_tablet_v2_get_user_data (wp_tablet);
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle enter, pad = %p, tablet = %p surface = %p",
                        wp_tablet_pad, wp_tablet, surface));
 
@@ -4242,8 +4269,9 @@ tablet_pad_handle_leave (void                     *data,
                          struct wl_surface        *surface)
 {
   GdkWaylandTabletPadData *pad = data;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle leave, pad = %p, surface = %p",
                        wp_tablet_pad, surface));
 
@@ -4259,8 +4287,9 @@ tablet_pad_handle_removed (void                     *data,
                            struct zwp_tablet_pad_v2 *wp_tablet_pad)
 {
   GdkWaylandTabletPadData *pad = data;
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (pad->seat);
 
-  GDK_SEAT_NOTE (pad->seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("tablet pad handle removed, pad = %p", wp_tablet_pad));
 
   /* Remove from the current tablet */
@@ -4432,7 +4461,7 @@ pointer_surface_enter (void              *data,
   GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (gdk_device_get_seat (device));
   GdkWaylandTabletData *tablet;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("pointer surface of seat %p entered output %p",
                        seat, output));
 
@@ -4461,7 +4490,7 @@ pointer_surface_leave (void              *data,
   GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (gdk_device_get_seat (device));
   GdkWaylandTabletData *tablet;
 
-  GDK_SEAT_NOTE (seat, EVENTS,
+  GDK_DISPLAY_NOTE (seat->display, EVENTS,
             g_message ("pointer surface of seat %p left output %p",
                        seat, output));
 

gdk/wayland/gdkdisplay-wayland.c

@@ -47,7 +47,6 @@
 #include "gdkglcontext-wayland.h"
 #include "gdkvulkancontext-wayland.h"
 #include "gdkwaylandmonitor.h"
-#include "gdkprofilerprivate.h"
 #include <wayland/pointer-gestures-unstable-v1-client-protocol.h>
 #include "tablet-unstable-v2-client-protocol.h"
 #include <wayland/xdg-shell-unstable-v6-client-protocol.h>
@@ -726,6 +725,7 @@ static void
 gdk_wayland_display_finalize (GObject *object)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (object);
+  guint i;
 
   _gdk_wayland_display_finalize_cursors (display_wayland);
 
@@ -733,10 +733,13 @@ gdk_wayland_display_finalize (GObject *object)
   g_free (display_wayland->cursor_theme_name);
   xkb_context_unref (display_wayland->xkb_context);
 
-  if (display_wayland->cursor_theme)
+  for (i = 0; i < GDK_WAYLAND_THEME_SCALES_COUNT; i++)
     {
-      wl_cursor_theme_destroy (display_wayland->cursor_theme);
-      display_wayland->cursor_theme = NULL;
+      if (display_wayland->scaled_cursor_themes[i])
+        {
+          wl_cursor_theme_destroy (display_wayland->scaled_cursor_themes[i]);
+          display_wayland->scaled_cursor_themes[i] = NULL;
+        }
     }
 
   g_ptr_array_free (display_wayland->monitors, TRUE);
@@ -1056,33 +1059,6 @@ gdk_wayland_display_get_toplevel_surfaces (GdkDisplay *display)
   return GDK_WAYLAND_DISPLAY (display)->toplevels;
 }
 
-static struct wl_cursor_theme *
-get_cursor_theme (GdkWaylandDisplay *display_wayland,
-                  const char *name,
-                  int size)
-{
-  const char * const *xdg_data_dirs;
-  struct wl_cursor_theme *theme = NULL;
-  int i;
-
-  xdg_data_dirs = g_get_system_data_dirs ();
-  for (i = 0; xdg_data_dirs[i]; i++)
-    {
-      char *path = g_build_filename (xdg_data_dirs[i], "icons", name, "cursors", NULL);
-
-      if (g_file_test (path, G_FILE_TEST_IS_DIR))
-        theme = wl_cursor_theme_create (path, size, display_wayland->shm);
-
-      g_free (path);
-
-      if (theme)
-        return theme;
-    }
-
-  /* This may fall back to builtin cursors */
-  return wl_cursor_theme_create ("/usr/share/icons/default/cursors", size, display_wayland->shm);
-}
-
 void
 gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
                                       const gchar *name,
@@ -1090,6 +1066,7 @@ gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY(display);
   struct wl_cursor_theme *theme;
+  int i;
 
   g_assert (display_wayland);
   g_assert (display_wayland->shm);
@@ -1098,20 +1075,22 @@ gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
       display_wayland->cursor_theme_size == size)
     return;
 
-  theme = get_cursor_theme (display_wayland, name, size);
-
+  theme = wl_cursor_theme_load (name, size, display_wayland->shm);
   if (theme == NULL)
     {
       g_warning ("Failed to load cursor theme %s", name);
       return;
     }
 
-  if (display_wayland->cursor_theme)
+  for (i = 0; i < GDK_WAYLAND_THEME_SCALES_COUNT; i++)
     {
-      wl_cursor_theme_destroy (display_wayland->cursor_theme);
-      display_wayland->cursor_theme = NULL;
+      if (display_wayland->scaled_cursor_themes[i])
+        {
+          wl_cursor_theme_destroy (display_wayland->scaled_cursor_themes[i]);
+          display_wayland->scaled_cursor_themes[i] = NULL;
+        }
     }
-  display_wayland->cursor_theme = theme;
+  display_wayland->scaled_cursor_themes[0] = theme;
   if (display_wayland->cursor_theme_name != NULL)
     g_free (display_wayland->cursor_theme_name);
   display_wayland->cursor_theme_name = g_strdup (name);
@@ -1119,11 +1098,31 @@ gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
 }
 
 struct wl_cursor_theme *
-_gdk_wayland_display_get_cursor_theme (GdkWaylandDisplay *display_wayland)
+_gdk_wayland_display_get_scaled_cursor_theme (GdkWaylandDisplay *display_wayland,
+                                              guint              scale)
 {
-  g_assert (display_wayland->cursor_theme_name);
+  struct wl_cursor_theme *theme;
 
-  return display_wayland->cursor_theme;
+  g_assert (display_wayland->cursor_theme_name);
+  g_assert (scale <= GDK_WAYLAND_MAX_THEME_SCALE);
+  g_assert (scale >= 1);
+
+  theme = display_wayland->scaled_cursor_themes[scale - 1];
+  if (!theme)
+    {
+      theme = wl_cursor_theme_load (display_wayland->cursor_theme_name,
+                                    display_wayland->cursor_theme_size * scale,
+                                    display_wayland->shm);
+      if (theme == NULL)
+        {
+          g_warning ("Failed to load cursor theme %s with scale %u",
+                     display_wayland->cursor_theme_name, scale);
+          return NULL;
+        }
+      display_wayland->scaled_cursor_themes[scale - 1] = theme;
+    }
+
+  return theme;
 }
 
 static void
@@ -1132,7 +1131,6 @@ _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland)
   guint size;
   const gchar *name;
   GValue v = G_VALUE_INIT;
-  gint64 before = g_get_monotonic_time ();
 
   g_assert (display_wayland);
   g_assert (display_wayland->shm);
@@ -1152,12 +1150,6 @@ _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland)
 
   gdk_wayland_display_set_cursor_theme (GDK_DISPLAY (display_wayland), name, size);
   g_value_unset (&v);
-
-  if (gdk_profiler_is_running ())
-    {
-      gdk_profiler_add_mark (before * 1000, (g_get_monotonic_time () - before) * 1000, "wayland", "load cursor theme");
-    }
-
 }
 
 guint32
@@ -2315,11 +2307,10 @@ xdg_output_handle_description (void                  *data,
                                struct zxdg_output_v1 *xdg_output,
                                const char            *description)
 {
+  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *) data;
+
   GDK_NOTE (MISC,
-            {
-              GdkWaylandMonitor *monitor = (GdkWaylandMonitor *) data;
-              g_message ("handle description xdg-output %d", monitor->id);
-            });
+            g_message ("handle description xdg-output %d", monitor->id));
 }
 
 static const struct zxdg_output_v1_listener xdg_output_listener = {

gdk/wayland/gdkdisplay-wayland.h

@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include <wayland-client.h>
+#include <wayland-cursor.h>
 #include <wayland-egl.h>
 #include <gdk/wayland/tablet-unstable-v2-client-protocol.h>
 #include <gdk/wayland/gtk-shell-client-protocol.h>
@@ -44,7 +45,6 @@
 
 #include "gdkdisplayprivate.h"
 #include "gdkwaylanddevice.h"
-#include "cursor/wayland-cursor.h"
 
 #include <epoxy/egl.h>
 
@@ -126,7 +126,7 @@ struct _GdkWaylandDisplay
 
   GList *current_popups;
 
-  struct wl_cursor_theme *cursor_theme;
+  struct wl_cursor_theme *scaled_cursor_themes[GDK_WAYLAND_THEME_SCALES_COUNT];
   gchar *cursor_theme_name;
   int cursor_theme_size;
   GHashTable *cursor_surface_cache;

gdk/wayland/gdkdrop-wayland.c

@@ -181,17 +181,19 @@ gdk_wayland_drop_read_async (GdkDrop             *drop,
                              gpointer             user_data)
 {
   GdkWaylandDrop *wayland_drop = GDK_WAYLAND_DROP (drop);
+  GdkDisplay *display;
   GInputStream *stream;
   const char *mime_type;
   int pipe_fd[2];
   GError *error = NULL;
   GTask *task;
 
+  display = gdk_drop_get_display (drop),
   task = g_task_new (drop, cancellable, callback, user_data);
   g_task_set_priority (task, io_priority);
   g_task_set_source_tag (task, gdk_wayland_drop_read_async);
 
-  GDK_DISPLAY_NOTE (gdk_drop_get_display (drop), DND, char *s = gdk_content_formats_to_string (formats);
+  GDK_DISPLAY_NOTE (display, DND, char *s = gdk_content_formats_to_string (formats);
                     g_message ("%p: read for %s", drop, s);
                     g_free (s); );
   mime_type = gdk_content_formats_match_mime_type (formats,

gdk/wayland/gdkglcontext-wayland.c

@@ -31,7 +31,6 @@
 
 #include "gdkinternals.h"
 #include "gdksurfaceprivate.h"
-#include "gdkprofilerprivate.h"
 
 #include "gdkintl.h"
 
@@ -239,7 +238,6 @@ gdk_wayland_gl_context_end_frame (GdkDrawContext *draw_context,
   gdk_wayland_surface_sync (surface);
   gdk_wayland_surface_request_frame (surface);
 
-  gdk_profiler_add_mark (g_get_monotonic_time () * 1000, 0, "wayland", "swap buffers");
   if (display_wayland->have_egl_swap_buffers_with_damage)
     {
       int i, j, n_rects = cairo_region_num_rectangles (painted);

gdk/wayland/gdkprivate-wayland.h

@@ -57,7 +57,8 @@ gboolean           _gdk_wayland_keymap_key_is_modifier (GdkKeymap *keymap,
 void       _gdk_wayland_display_init_cursors (GdkWaylandDisplay *display);
 void       _gdk_wayland_display_finalize_cursors (GdkWaylandDisplay *display);
 
-struct wl_cursor_theme * _gdk_wayland_display_get_cursor_theme (GdkWaylandDisplay *display_wayland);
+struct wl_cursor_theme * _gdk_wayland_display_get_scaled_cursor_theme (GdkWaylandDisplay *display_wayland,
+                                                                       guint              scale);
 
 void       _gdk_wayland_display_get_default_cursor_size (GdkDisplay *display,
                                                          guint       *width,

gdk/wayland/gdksurface-wayland.c

@@ -357,7 +357,6 @@ frame_callback (void               *data,
   GdkFrameClock *clock = gdk_surface_get_frame_clock (surface);
   GdkFrameTimings *timings;
 
-  gdk_profiler_add_mark (g_get_monotonic_time () * 1000, 0, "wayland", "frame event");
   GDK_DISPLAY_NOTE (GDK_DISPLAY (display_wayland), EVENTS, g_message ("frame %p", surface));
 
   wl_callback_destroy (callback);
@@ -396,10 +395,10 @@ frame_callback (void               *data,
 #ifdef G_ENABLE_DEBUG
   if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
     _gdk_frame_clock_debug_print_timings (clock, timings);
-#endif
 
   if (gdk_profiler_is_running ())
     _gdk_frame_clock_add_timings_to_profiler (clock, timings);
+#endif
 }
 
 static const struct wl_callback_listener frame_listener = {
@@ -478,7 +477,6 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
        * before we need to stage any changes, then we can take it back and
        * use it again.
        */
-      gdk_profiler_add_mark (g_get_monotonic_time () * 1000, 0, "wayland", "surface commit");
       wl_surface_commit (impl->display_server.wl_surface);
 
       impl->pending_commit = FALSE;
@@ -1510,7 +1508,6 @@ gdk_wayland_surface_create_xdg_toplevel (GdkSurface *surface)
   if (impl->hint == GDK_SURFACE_TYPE_HINT_DIALOG)
     _gdk_wayland_screen_add_orphan_dialog (surface);
 
-  gdk_profiler_add_mark (g_get_monotonic_time () * 1000, 0, "wayland", "surface commit");
   wl_surface_commit (impl->display_server.wl_surface);
 }
 
@@ -2305,7 +2302,6 @@ gdk_wayland_surface_create_xdg_popup (GdkSurface     *surface,
         }
     }
 
-  gdk_profiler_add_mark (g_get_monotonic_time () * 1000, 0, "wayland", "surface commit");
   wl_surface_commit (impl->display_server.wl_surface);
 
   impl->popup_parent = parent;
@@ -4113,7 +4109,7 @@ gdk_wayland_surface_is_exported (GdkSurface *surface)
  * gdk_wayland_surface_export_handle:
  * @surface: the #GdkSurface to obtain a handle for
  * @callback: callback to call with the handle
- * @user_data: (closure): user data for @callback
+ * @user_data: user data for @callback
  * @destroy_func: destroy notify for @user_data
  *
  * Asynchronously obtains a handle for a surface that can be passed

gdk/wayland/meson.build

@@ -1,5 +1,3 @@
-subdir('cursor')
-
 gdk_wayland_sources = files([
   'gdkapplaunchcontext-wayland.c',
   'gdkcairocontext-wayland.c',
@@ -35,6 +33,7 @@ gdk_wayland_deps = [
   xkbdep,
   wlclientdep,
   wlprotocolsdep,
+  wlcursordep,
   wlegldep,
 ]
 
@@ -106,5 +105,4 @@ libgdk_wayland = static_library('gdk-wayland',
                                   '-DG_LOG_DOMAIN="Gdk"',
                                 ] + common_cflags,
                                 link_args: common_ldflags,
-                                link_with: [libwayland_cursor, ],
-                                dependencies: [ gdk_deps, gdk_wayland_deps])
+                                dependencies: [ gdk_deps, gdk_wayland_deps, ])

gdk/x11/gdkclipboard-x11.c

@@ -65,15 +65,16 @@ print_atoms (GdkX11Clipboard *cb,
              const Atom      *atoms,
              gsize            n_atoms)
 {
-  GDK_DISPLAY_NOTE (gdk_clipboard_get_display (GDK_CLIPBOARD (cb)), CLIPBOARD, {
+  GdkDisplay *display = gdk_clipboard_get_display (GDK_CLIPBOARD (cb));
+
+  GDK_DISPLAY_NOTE (display, CLIPBOARD,
       gsize i;
-      GdkDisplay *display = gdk_clipboard_get_display (GDK_CLIPBOARD (cb));
 
       g_printerr ("%s: %s [ ", cb->selection, prefix);
       for (i = 0; i < n_atoms; i++)
         g_printerr ("%s%s", i > 0 ? ", " : "", gdk_x11_get_xatom_name_for_display (display , atoms[i]));
       g_printerr (" ]\n");
-  });
+  );
 }
 
 static void
@@ -85,7 +86,9 @@ gdk_x11_clipboard_default_output_done (GObject      *clipboard,
 
   if (!gdk_clipboard_write_finish (GDK_CLIPBOARD (clipboard), result, &error))
     {
-      GDK_DISPLAY_NOTE (gdk_clipboard_get_display (GDK_CLIPBOARD (clipboard)), CLIPBOARD,
+      GdkDisplay *display = gdk_clipboard_get_display (GDK_CLIPBOARD (clipboard));
+
+      GDK_DISPLAY_NOTE (display, CLIPBOARD,
                 g_printerr ("%s: failed to write stream: %s\n",
                             GDK_X11_CLIPBOARD (clipboard)->selection, error->message));
       g_error_free (error);
@@ -437,20 +440,16 @@ gdk_x11_clipboard_xevent (GdkDisplay   *display,
 
     case SelectionRequest:
       {
-#ifdef G_ENABLE_DEBUG
-       const char *target, *property;
-#endif
+        const char *target, *property;
 
         if (xevent->xselectionrequest.selection != cb->xselection)
           return FALSE;
 
-#ifdef G_ENABLE_DEBUG
         target = gdk_x11_get_xatom_name_for_display (display, xevent->xselectionrequest.target);
         if (xevent->xselectionrequest.property == None)
           property = target;
         else
           property = gdk_x11_get_xatom_name_for_display (display, xevent->xselectionrequest.property);
-#endif
 
         if (!gdk_clipboard_is_local (GDK_CLIPBOARD (cb)))
           {

gdk/x11/gdkdrag-x11.c

@@ -1061,7 +1061,6 @@ xdnd_send_enter (GdkX11Drag *drag_x11)
 {
   GdkDrag *drag = GDK_DRAG (drag_x11);
   GdkDisplay *display = gdk_drag_get_display (drag);
-  GdkContentFormats *formats;
   const char * const *atoms;
   gsize i, n_atoms;
   XEvent xev;
@@ -1081,10 +1080,7 @@ xdnd_send_enter (GdkX11Drag *drag_x11)
   GDK_DISPLAY_NOTE (display, DND,
            g_message ("Sending enter source window %#lx XDND protocol version %d\n",
                       GDK_SURFACE_XID (drag_x11->ipc_surface), drag_x11->version));
-  formats = gdk_content_formats_ref (gdk_drag_get_formats (drag));
-  formats = gdk_content_formats_union_serialize_mime_types (formats);
-
-  atoms = gdk_content_formats_get_mime_types (formats, &n_atoms);
+  atoms = gdk_content_formats_get_mime_types (gdk_drag_get_formats (drag), &n_atoms);
 
   if (n_atoms > 3)
     {
@@ -1304,7 +1300,8 @@ xdnd_precache_atoms (GdkDisplay *display)
 /* Source side */
 
 static void
-gdk_drag_do_leave (GdkX11Drag *drag_x11)
+gdk_drag_do_leave (GdkX11Drag *drag_x11,
+                   guint32            time)
 {
   if (drag_x11->proxy_xid)
     {
@@ -1505,10 +1502,27 @@ gdk_x11_drag_drag_motion (GdkDrag *drag,
         }
     }
 
+  /* When we have a Xdnd target, make sure our XdndActionList
+   * matches the current actions;
+   */
+  if (protocol == GDK_DRAG_PROTO_XDND && drag_x11->xdnd_actions != gdk_drag_get_actions (drag))
+    {
+      if (proxy_xid)
+        {
+          GdkDisplay *display = gdk_drag_get_display (drag);
+          GdkDrop *drop = GDK_X11_DISPLAY (display)->current_drop;
+
+          if (drop && GDK_SURFACE_XID (gdk_drop_get_surface (drop)) == proxy_xid)
+            gdk_x11_drop_read_actions (drop);
+          else
+            xdnd_set_actions (drag_x11);
+        }
+    }
+
   if (drag_x11->proxy_xid != proxy_xid)
     {
       /* Send a leave to the last destination */
-      gdk_drag_do_leave (drag_x11);
+      gdk_drag_do_leave (drag_x11, time);
       drag_x11->drag_status = GDK_DRAG_STATUS_DRAG;
 
       /* Check if new destination accepts drags, and which protocol */
@@ -1544,23 +1558,6 @@ gdk_x11_drag_drag_motion (GdkDrag *drag,
       drag_x11->current_action = gdk_drag_get_selected_action (drag);
     }
 
-  /* When we have a Xdnd target, make sure our XdndActionList
-   * matches the current actions;
-   */
-  if (protocol == GDK_DRAG_PROTO_XDND && drag_x11->xdnd_actions != gdk_drag_get_actions (drag))
-    {
-      if (proxy_xid)
-        {
-          GdkDisplay *display = gdk_drag_get_display (drag);
-          GdkDrop *drop = GDK_X11_DISPLAY (display)->current_drop;
-
-          if (drop && GDK_SURFACE_XID (gdk_drop_get_surface (drop)) == proxy_xid)
-            gdk_x11_drop_read_actions (drop);
-          else
-            xdnd_set_actions (drag_x11);
-        }
-    }
-
   /* Send a drag-motion event */
 
   drag_x11->last_x = x_root;
@@ -1749,20 +1746,16 @@ gdk_x11_drag_xevent (GdkDisplay   *display,
 
     case SelectionRequest:
       {
-#ifdef G_ENABLE_DEBUG
         const char *target, *property;
-#endif
 
         if (xevent->xselectionrequest.selection != xselection)
           return FALSE;
 
-#ifdef G_ENABLE_DEBUG
         target = gdk_x11_get_xatom_name_for_display (display, xevent->xselectionrequest.target);
         if (xevent->xselectionrequest.property == None)
           property = target;
         else
           property = gdk_x11_get_xatom_name_for_display (display, xevent->xselectionrequest.property);
-#endif
 
         if (xevent->xselectionrequest.requestor == None)
           {
@@ -1821,7 +1814,6 @@ struct _GdkDragAnim {
 static void
 gdk_drag_anim_destroy (GdkDragAnim *anim)
 {
-  gdk_surface_hide (anim->drag->drag_surface);
   g_object_unref (anim->drag);
   g_slice_free (GdkDragAnim, anim);
 }
@@ -2145,7 +2137,6 @@ static void
 gdk_x11_drag_cancel (GdkDrag             *drag,
                      GdkDragCancelReason  reason)
 {
-  gdk_drag_do_leave (GDK_X11_DRAG (drag));
   drag_ungrab (drag);
   gdk_drag_drop_done (drag, FALSE);
 }

gdk/x11/gdkdrop-x11.c

@@ -145,9 +145,9 @@ gdk_x11_drop_read_got_stream (GObject      *source,
     }
   else
     {
+      const char *mime_type = ((GSList *) g_task_get_task_data (task))->data;
 #if 0
       gsize i;
-      const char *mime_type = ((GSList *) g_task_get_task_data (task))->data;
 
       for (i = 0; i < G_N_ELEMENTS (special_targets); i++)
         {
@@ -166,7 +166,7 @@ gdk_x11_drop_read_got_stream (GObject      *source,
 #endif
 
       GDK_NOTE (DND, g_printerr ("reading DND as %s now\n",
-                                 (const char *)((GSList *) g_task_get_task_data (task))->data));
+                                mime_type));
       g_task_return_pointer (task, stream, g_object_unref);
     }
 
@@ -732,14 +732,14 @@ gdk_x11_drop_do_nothing (Window   window,
                          gboolean success,
                          gpointer data)
 {
-#ifdef G_ENABLE_DEBUG
   GdkDisplay *display = data;
 
   if (!success)
     {
-      GDK_DISPLAY_NOTE (display, DND, g_message ("Send event to %lx failed", window));
+      GDK_DISPLAY_NOTE (display, DND,
+                g_message ("Send event to %lx failed",
+                           window));
     }
-#endif
 }
 
 static void
@@ -747,7 +747,7 @@ gdk_x11_drop_status (GdkDrop       *drop,
                      GdkDragAction  actions)
 {
   GdkX11Drop *drop_x11 = GDK_X11_DROP (drop);
-  GdkDragAction possible_actions, suggested_action;
+  GdkDragAction possible_actions;
   XEvent xev;
   GdkDisplay *display;
 
@@ -755,17 +755,6 @@ gdk_x11_drop_status (GdkDrop       *drop,
 
   possible_actions = actions & gdk_drop_get_actions (drop);
 
-  if (drop_x11->suggested_action != 0)
-    suggested_action = drop_x11->suggested_action;
-  else if (possible_actions & GDK_ACTION_COPY)
-    suggested_action = GDK_ACTION_COPY;
-  else if (possible_actions & GDK_ACTION_MOVE)
-    suggested_action = GDK_ACTION_MOVE;
-  else if (possible_actions & GDK_ACTION_ASK)
-    suggested_action = GDK_ACTION_ASK;
-  else
-    suggested_action = 0;
-
   xev.xclient.type = ClientMessage;
   xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "XdndStatus");
   xev.xclient.format = 32;
@@ -775,7 +764,7 @@ gdk_x11_drop_status (GdkDrop       *drop,
   xev.xclient.data.l[1] = (possible_actions != 0) ? (2 | 1) : 0;
   xev.xclient.data.l[2] = 0;
   xev.xclient.data.l[3] = 0;
-  xev.xclient.data.l[4] = xdnd_action_to_atom (display, suggested_action);
+  xev.xclient.data.l[4] = xdnd_action_to_atom (display, possible_actions);
 
   if (gdk_drop_get_drag (drop))
     {

gsk/gl/gskglrenderer.c

@@ -196,7 +196,7 @@ dump_node (GskRenderNode *node,
   cairo_surface_destroy (surface);
 }
 
-static inline gboolean G_GNUC_PURE
+static inline gboolean
 node_is_invisible (const GskRenderNode *node)
 {
   return node->bounds.size.width == 0.0f ||
@@ -237,7 +237,7 @@ sort_border_sides (const GdkRGBA *colors,
     }
 }
 
-static inline gboolean G_GNUC_PURE
+static inline gboolean
 color_matrix_modifies_alpha (GskRenderNode *node)
 {
   const graphene_matrix_t *matrix = gsk_color_matrix_node_peek_color_matrix (node);
@@ -261,7 +261,7 @@ gsk_rounded_rect_shrink_to_minimum (GskRoundedRect *self)
                                          MAX (self->corner[2].height, self->corner[3].height)) * 2);
 }
 
-static inline gboolean G_GNUC_PURE
+static inline gboolean
 node_supports_transform (GskRenderNode *node)
 {
   /* Some nodes can't handle non-trivial transforms without being
@@ -535,16 +535,17 @@ transform_rect (GskGLRenderer        *self,
                 RenderOpBuilder      *builder,
                 const GskRoundedRect *rect)
 {
+  const float scale = ops_get_scale (builder);
   GskRoundedRect r;
+  int i;
 
-  r.bounds.origin.x = builder->dx + rect->bounds.origin.x;
-  r.bounds.origin.y = builder->dy + rect->bounds.origin.y;
-  r.bounds.size = rect->bounds.size;
+  ops_transform_bounds_modelview (builder, &rect->bounds, &r.bounds);
 
-  r.corner[0] = rect->corner[0];
-  r.corner[1] = rect->corner[1];
-  r.corner[2] = rect->corner[2];
-  r.corner[3] = rect->corner[3];
+  for (i = 0; i < 4; i ++)
+    {
+      r.corner[i].width = rect->corner[i].width * scale;
+      r.corner[i].height = rect->corner[i].height * scale;
+    }
 
   return r;
 }
@@ -611,7 +612,7 @@ render_fallback_node (GskGLRenderer   *self,
   cairo_fill (cr);
   cairo_restore (cr);
 
-#ifdef G_ENABLE_DEBUG
+#if G_ENABLE_DEBUG
   if (GSK_RENDERER_DEBUG_CHECK (GSK_RENDERER (self), FALLBACK))
     {
       cairo_move_to (cr, 0, 0);
@@ -744,35 +745,25 @@ render_border_node (GskGLRenderer   *self,
                     GskRenderNode   *node,
                     RenderOpBuilder *builder)
 {
+  const float scale = ops_get_scale (builder);
+  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;
   const GdkRGBA *colors = gsk_border_node_peek_colors (node);
   const GskRoundedRect *rounded_outline = gsk_border_node_peek_outline (node);
-  const float *widths = gsk_border_node_peek_widths (node);
+  const float *og_widths = gsk_border_node_peek_widths (node);
+  GskRoundedRect outline;
+  float widths[4];
   int i;
   struct {
     float w;
     float h;
   } sizes[4];
 
-  if (widths[0] == widths[1] &&
-      widths[0] == widths[2] &&
-      widths[0] == widths[3] &&
-      gdk_rgba_equal (&colors[0], &colors[1]) &&
-      gdk_rgba_equal (&colors[0], &colors[2]) &&
-      gdk_rgba_equal (&colors[0], &colors[3]))
-    {
-      OpShadow *op;
 
-      ops_set_program (builder, &self->inset_shadow_program);
-      op = ops_begin (builder, OP_CHANGE_INSET_SHADOW);
-      op->color = &colors[0];
-      op->outline = transform_rect (self, builder, rounded_outline);
-      op->spread = widths[0];
-      op->offset[0] = 0;
-      op->offset[1] = 0;
-
-      load_vertex_data (ops_draw (builder, NULL), node, builder);
-      return;
-    }
+  for (i = 0; i < 4; i ++)
+    widths[i] = og_widths[i];
 
   /* Top left */
   if (widths[3] > 0)
@@ -819,11 +810,10 @@ render_border_node (GskGLRenderer   *self,
   else
     sizes[3].h = 0;
 
+  for (i = 0; i < 4; i ++)
+    widths[i] *= scale;
+
   {
-    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;
     const GskQuadVertex side_data[4][6] = {
       /* Top */
       {
@@ -867,7 +857,6 @@ render_border_node (GskGLRenderer   *self,
       }
     };
     int indices[4] = { 0, 1, 2, 3 };
-    GskRoundedRect outline;
 
     /* We sort them by color */
     sort_border_sides (colors, indices);
@@ -1180,16 +1169,17 @@ render_rounded_clip_node (GskGLRenderer       *self,
                           RenderOpBuilder     *builder)
 {
   const float scale = ops_get_scale (builder);
-  const GskRoundedRect *clip = gsk_rounded_clip_node_peek_clip (node);
-  GskRenderNode *child = gsk_rounded_clip_node_get_child (node);
+  GskRoundedRect child_clip = *gsk_rounded_clip_node_peek_clip (node);
   GskRoundedRect transformed_clip;
+  GskRenderNode *child = gsk_rounded_clip_node_get_child (node);
   gboolean need_offscreen;
   int i;
 
   if (node_is_invisible (child))
     return;
 
-  ops_transform_bounds_modelview (builder, &clip->bounds, &transformed_clip.bounds);
+  transformed_clip = child_clip;
+  ops_transform_bounds_modelview (builder, &child_clip.bounds, &transformed_clip.bounds);
 
   if (!ops_has_clip (builder))
     need_offscreen = FALSE;
@@ -1205,8 +1195,8 @@ render_rounded_clip_node (GskGLRenderer       *self,
        * the new clip and add the render ops */
       for (i = 0; i < 4; i ++)
         {
-          transformed_clip.corner[i].width = clip->corner[i].width * scale;
-          transformed_clip.corner[i].height = clip->corner[i].height * scale;
+          transformed_clip.corner[i].width *= scale;
+          transformed_clip.corner[i].height *= scale;
         }
 
       ops_push_clip (builder, &transformed_clip);
@@ -1215,7 +1205,7 @@ render_rounded_clip_node (GskGLRenderer       *self,
     }
   else
     {
-      GskRoundedRect scaled_clip;
+      graphene_matrix_t scale_matrix;
       gboolean is_offscreen;
       TextureRegion region;
       /* NOTE: We are *not* transforming the clip by the current modelview here.
@@ -1224,19 +1214,18 @@ render_rounded_clip_node (GskGLRenderer       *self,
        *
        *       We do, however, apply the scale factor to the child clip of course.
        */
-      scaled_clip.bounds.origin.x = clip->bounds.origin.x * scale;
-      scaled_clip.bounds.origin.y = clip->bounds.origin.y * scale;
-      scaled_clip.bounds.size.width = clip->bounds.size.width * scale;
-      scaled_clip.bounds.size.height = clip->bounds.size.height * scale;
+
+      graphene_matrix_init_scale (&scale_matrix, scale, scale, 1.0f);
+      graphene_matrix_transform_bounds (&scale_matrix, &child_clip.bounds, &child_clip.bounds);
 
       /* Increase corner radius size by scale factor */
       for (i = 0; i < 4; i ++)
         {
-          scaled_clip.corner[i].width = clip->corner[i].width * scale;
-          scaled_clip.corner[i].height = clip->corner[i].height * scale;
+          child_clip.corner[i].width *= scale;
+          child_clip.corner[i].height *= scale;
         }
 
-      ops_push_clip (builder, &scaled_clip);
+      ops_push_clip (builder, &child_clip);
       if (!add_offscreen_ops (self, builder, &node->bounds,
                               child,
                               &region, &is_offscreen,
@@ -1446,9 +1435,6 @@ render_blur_node (GskGLRenderer   *self,
   GskRenderNode *child = gsk_blur_node_get_child (node);
   TextureRegion blurred_region;
 
-  if (node_is_invisible (child))
-    return;
-
   if (blur_radius <= 0)
     {
       gsk_gl_renderer_add_render_ops (self, child, builder);
@@ -1475,6 +1461,7 @@ render_unblurred_inset_shadow_node (GskGLRenderer   *self,
                                     GskRenderNode   *node,
                                     RenderOpBuilder *builder)
 {
+  const float scale = ops_get_scale (builder);
   const float blur_radius = gsk_inset_shadow_node_get_blur_radius (node);
   const float dx = gsk_inset_shadow_node_get_dx (node);
   const float dy = gsk_inset_shadow_node_get_dy (node);
@@ -1487,9 +1474,9 @@ render_unblurred_inset_shadow_node (GskGLRenderer   *self,
   op = ops_begin (builder, OP_CHANGE_INSET_SHADOW);
   op->color = gsk_inset_shadow_node_peek_color (node);
   op->outline = transform_rect (self, builder, gsk_inset_shadow_node_peek_outline (node));
-  op->spread = spread;
-  op->offset[0] = dx;
-  op->offset[1] = dy;
+  op->spread = spread * scale;
+  op->offset[0] = dx * scale;
+  op->offset[1] = dy * scale;
 
   load_vertex_data (ops_draw (builder, NULL), node, builder);
 }
@@ -1640,6 +1627,7 @@ render_unblurred_outset_shadow_node (GskGLRenderer   *self,
                                      GskRenderNode   *node,
                                      RenderOpBuilder *builder)
 {
+  const float scale = ops_get_scale (builder);
   const GskRoundedRect *outline = gsk_outset_shadow_node_peek_outline (node);
   const float spread = gsk_outset_shadow_node_get_spread (node);
   const float dx = gsk_outset_shadow_node_get_dx (node);
@@ -1650,14 +1638,13 @@ render_unblurred_outset_shadow_node (GskGLRenderer   *self,
   op = ops_begin (builder, OP_CHANGE_UNBLURRED_OUTSET_SHADOW);
   op->color = gsk_outset_shadow_node_peek_color (node);
   op->outline = transform_rect (self, builder, outline);
-  op->spread = spread;
-  op->offset[0] = dx;
-  op->offset[1] = dy;
+  op->spread = spread * scale;
+  op->offset[0] = dx * scale;
+  op->offset[1] = dy * scale;
 
   load_vertex_data (ops_draw (builder, NULL), node, builder);
 }
 
-static GdkRGBA COLOR_WHITE = { 1, 1, 1, 1 };
 static inline void
 render_outset_shadow_node (GskGLRenderer   *self,
                            GskRenderNode   *node,
@@ -1665,7 +1652,6 @@ render_outset_shadow_node (GskGLRenderer   *self,
 {
   const float scale = ops_get_scale (builder);
   const GskRoundedRect *outline = gsk_outset_shadow_node_peek_outline (node);
-  const GdkRGBA *color = gsk_outset_shadow_node_peek_color (node);
   const float blur_radius = gsk_outset_shadow_node_get_blur_radius (node);
   const float blur_extra = blur_radius * 3; /* 3 Because we use that in the shader as well */
   const float spread = gsk_outset_shadow_node_get_spread (node);
@@ -1741,7 +1727,7 @@ render_outset_shadow_node (GskGLRenderer   *self,
       /* Draw outline */
       ops_set_program (builder, &self->color_program);
       ops_push_clip (builder, &scaled_outline);
-      ops_set_color (builder, &COLOR_WHITE);
+      ops_set_color (builder, gsk_outset_shadow_node_peek_color (node));
       ops_draw (builder, (GskQuadVertex[GL_N_VERTICES]) {
         { { 0,                            }, { 0, 1 }, },
         { { 0,             texture_height }, { 0, 0 }, },
@@ -1777,7 +1763,6 @@ render_outset_shadow_node (GskGLRenderer   *self,
     }
 
   ops_set_program (builder, &self->outset_shadow_program);
-  ops_set_color (builder, color);
   ops_set_texture (builder, blurred_texture_id);
 
   shadow = ops_begin (builder, OP_CHANGE_OUTSET_SHADOW);
@@ -2155,24 +2140,14 @@ render_cross_fade_node (GskGLRenderer   *self,
                           start_node,
                           &start_region, &is_offscreen1,
                           FORCE_OFFSCREEN | RESET_CLIP | RESET_OPACITY))
-    {
-      gsk_gl_renderer_add_render_ops (self, end_node, builder);
-      return;
-    }
+    g_assert_not_reached ();
 
   if (!add_offscreen_ops (self, builder,
                           &node->bounds,
                           end_node,
                           &end_region, &is_offscreen2,
                           FORCE_OFFSCREEN | RESET_CLIP | RESET_OPACITY))
-    {
-      load_vertex_data_with_region (ops_draw (builder, NULL),
-                                    node,
-                                    builder,
-                                    &start_region,
-                                    TRUE);
-      return;
-    }
+    g_assert_not_reached ();
 
   ops_set_program (builder, &self->cross_fade_program);
 
@@ -2578,7 +2553,6 @@ gsk_gl_renderer_create_programs (GskGLRenderer  *self,
   gboolean success = TRUE;
 
   gsk_gl_shader_builder_init (&shader_builder,
-                              "/org/gtk/libgsk/glsl/preamble.glsl",
                               "/org/gtk/libgsk/glsl/preamble.vs.glsl",
                               "/org/gtk/libgsk/glsl/preamble.fs.glsl");
 
@@ -2663,7 +2637,6 @@ gsk_gl_renderer_create_programs (GskGLRenderer  *self,
   INIT_PROGRAM_UNIFORM_LOCATION (inset_shadow, outline_rect);
 
   /* outset shadow */
-  INIT_PROGRAM_UNIFORM_LOCATION (outset_shadow, color);
   INIT_PROGRAM_UNIFORM_LOCATION (outset_shadow, outline_rect);
 
   /* unblurred outset shadow */
@@ -2773,7 +2746,6 @@ gsk_gl_renderer_realize (GskRenderer  *renderer,
                          GError      **error)
 {
   GskGLRenderer *self = GSK_GL_RENDERER (renderer);
-  gint64 before = g_get_monotonic_time ();
 
   /* If we didn't get a GdkGLContext before realization, try creating
    * one now, for our exclusive use.
@@ -2803,9 +2775,6 @@ gsk_gl_renderer_realize (GskRenderer  *renderer,
   self->icon_cache = get_icon_cache_for_display (gdk_surface_get_display (surface), self->atlases);
   gsk_gl_shadow_cache_init (&self->shadow_cache);
 
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000, (g_get_monotonic_time () - before) * 1000, "gl renderer realize", NULL);
-
   return TRUE;
 }
 
@@ -3492,7 +3461,7 @@ gsk_gl_renderer_do_render (GskRenderer           *renderer,
   gsk_profiler_push_samples (profiler);
 
   if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (start_time, cpu_time, "GL render", "");
+    gdk_profiler_add_mark (start_time, cpu_time, "render", "");
 
 #endif
 }

gsk/gl/gskglrenderops.c

@@ -8,7 +8,7 @@ rect_equal (const graphene_rect_t *a,
   return memcmp (a, b, sizeof (graphene_rect_t)) == 0;
 }
 
-static inline gboolean G_GNUC_PURE
+static inline gboolean
 rounded_rect_equal (const GskRoundedRect *r1,
                     const GskRoundedRect *r2)
 {
@@ -31,7 +31,7 @@ rounded_rect_equal (const GskRoundedRect *r1,
   return TRUE;
 }
 
-static inline gboolean G_GNUC_PURE
+static inline gboolean
 rounded_rect_corners_equal (const GskRoundedRect *r1,
                             const GskRoundedRect *r2)
 {
@@ -180,15 +180,13 @@ ops_transform_bounds_modelview (const RenderOpBuilder *builder,
                                 const graphene_rect_t *src,
                                 graphene_rect_t       *dst)
 {
-  graphene_rect_t r = *src;
-
   g_assert (builder->mv_stack != NULL);
   g_assert (builder->mv_stack->len >= 1);
 
-  r.origin.x += builder->dx;
-  r.origin.y += builder->dy;
+  gsk_transform_transform_bounds (builder->current_modelview, src, dst);
 
-  gsk_transform_transform_bounds (builder->current_modelview, &r, dst);
+  dst->origin.x += builder->dx * builder->scale_x;
+  dst->origin.y += builder->dy * builder->scale_y;
 }
 
 void

gsk/gl/gskglrenderopsprivate.h

@@ -73,7 +73,6 @@ struct _Program
       int outline_rect_location;
     } inset_shadow;
     struct {
-      int color_location;
       int outline_rect_location;
     } outset_shadow;
     struct {

gsk/gl/gskglshaderbuilder.c

@@ -9,17 +9,14 @@
 
 void
 gsk_gl_shader_builder_init (GskGLShaderBuilder *self,
-                            const char         *common_preamble_resource_path,
                             const char         *vs_preamble_resource_path,
                             const char         *fs_preamble_resource_path)
 {
   memset (self, 0, sizeof (*self));
 
-  self->preamble = g_resources_lookup_data (common_preamble_resource_path, 0, NULL);
   self->vs_preamble = g_resources_lookup_data (vs_preamble_resource_path, 0, NULL);
   self->fs_preamble = g_resources_lookup_data (fs_preamble_resource_path, 0, NULL);
 
-  g_assert (self->preamble);
   g_assert (self->vs_preamble);
   g_assert (self->fs_preamble);
 }
@@ -27,7 +24,6 @@ gsk_gl_shader_builder_init (GskGLShaderBuilder *self,
 void
 gsk_gl_shader_builder_finish (GskGLShaderBuilder *self)
 {
-  g_bytes_unref (self->preamble);
   g_bytes_unref (self->vs_preamble);
   g_bytes_unref (self->fs_preamble);
 }
@@ -106,14 +102,13 @@ gsk_gl_shader_builder_create_program (GskGLShaderBuilder  *self,
               "#version %d\n", self->version);
 
   vertex_id = glCreateShader (GL_VERTEX_SHADER);
-  glShaderSource (vertex_id, 8,
+  glShaderSource (vertex_id, 7,
                   (const char *[]) {
                     version_buffer,
                     self->debugging ? "#define GSK_DEBUG 1\n" : "",
                     self->legacy ? "#define GSK_LEGACY 1\n" : "",
                     self->gl3 ? "#define GSK_GL3 1\n" : "",
                     self->gles ? "#define GSK_GLES 1\n" : "",
-                    g_bytes_get_data (self->preamble, NULL),
                     g_bytes_get_data (self->vs_preamble, NULL),
                     vertex_shader_start
                   },
@@ -124,7 +119,6 @@ gsk_gl_shader_builder_create_program (GskGLShaderBuilder  *self,
                     -1,
                     -1,
                     -1,
-                    -1,
                     fragment_shader_start - vertex_shader_start
                   });
   glCompileShader (vertex_id);
@@ -136,14 +130,13 @@ gsk_gl_shader_builder_create_program (GskGLShaderBuilder  *self,
     }
 
   fragment_id = glCreateShader (GL_FRAGMENT_SHADER);
-  glShaderSource (fragment_id, 8,
+  glShaderSource (fragment_id, 7,
                   (const char *[]) {
                     version_buffer,
                     self->debugging ? "#define GSK_DEBUG 1\n" : "",
                     self->legacy ? "#define GSK_LEGACY 1\n" : "",
                     self->gl3 ? "#define GSK_GL3 1\n" : "",
                     self->gles ? "#define GSK_GLES 1\n" : "",
-                    g_bytes_get_data (self->preamble, NULL),
                     g_bytes_get_data (self->fs_preamble, NULL),
                     fragment_shader_start
                   },
@@ -155,7 +148,6 @@ gsk_gl_shader_builder_create_program (GskGLShaderBuilder  *self,
                     -1,
                     -1,
                     -1,
-                    -1,
                   });
   glCompileShader (fragment_id);
 

gsk/gl/gskglshaderbuilderprivate.h

@@ -8,7 +8,6 @@ G_BEGIN_DECLS
 
 typedef struct
 {
-  GBytes *preamble;
   GBytes *vs_preamble;
   GBytes *fs_preamble;
 
@@ -23,7 +22,6 @@ typedef struct
 
 
 void   gsk_gl_shader_builder_init             (GskGLShaderBuilder  *self,
-                                               const char          *common_preamble_resource_path,
                                                const char          *vs_preamble_resource_path,
                                                const char          *fs_preamble_resource_path);
 void   gsk_gl_shader_builder_finish           (GskGLShaderBuilder  *self);

gsk/gl/gskglshadowcache.c

@@ -25,12 +25,12 @@ key_equal (const void *x,
   const CacheKey *a = x;
   const CacheKey *b = y;
 
-  return a->blur_radius == b->blur_radius &&
-         graphene_size_equal (&a->outline.corner[0], &b->outline.corner[0]) &&
+  return graphene_size_equal (&a->outline.corner[0], &b->outline.corner[0]) &&
          graphene_size_equal (&a->outline.corner[1], &b->outline.corner[1]) &&
          graphene_size_equal (&a->outline.corner[2], &b->outline.corner[2]) &&
          graphene_size_equal (&a->outline.corner[3], &b->outline.corner[3]) &&
-         graphene_rect_equal (&a->outline.bounds, &b->outline.bounds);
+         graphene_rect_equal (&a->outline.bounds, &b->outline.bounds) &&
+         a->blur_radius == b->blur_radius;
 }
 
 void

gsk/gskrendernode.c

@@ -145,9 +145,9 @@ gsk_render_node_get_node_type (GskRenderNode *node)
   return node->node_class->node_type;
 }
 
-G_GNUC_PURE static inline
+static inline
 GskRenderNodeType
-_gsk_render_node_get_node_type (const GskRenderNode *node)
+_gsk_render_node_get_node_type (GskRenderNode *node)
 {
   return node->node_class->node_type;
 }
@@ -248,8 +248,8 @@ gsk_render_node_draw (GskRenderNode *node,
  * Returns: %TRUE if @node1 and @node2 can be expected to be compared
  **/
 gboolean
-gsk_render_node_can_diff (const GskRenderNode *node1,
-                          const GskRenderNode *node2)
+gsk_render_node_can_diff (GskRenderNode *node1,
+                          GskRenderNode *node2)
 {
   if (node1 == node2)
     return TRUE;
@@ -314,6 +314,9 @@ gsk_render_node_diff (GskRenderNode  *node1,
   return node1->node_class->diff (node1, node2, region);
 }
 
+#define GSK_RENDER_NODE_SERIALIZATION_VERSION 0
+#define GSK_RENDER_NODE_SERIALIZATION_ID "GskRenderNode"
+
 /**
  * gsk_render_node_write_to_file:
  * @node: a #GskRenderNode

gsk/gskrendernodeimpl.c

@@ -41,8 +41,8 @@ rectangle_init_from_graphene (cairo_rectangle_int_t *cairo,
 }
 
 static gboolean
-gsk_render_node_can_diff_true (const GskRenderNode *node1,
-                               const GskRenderNode *node2)
+gsk_render_node_can_diff_true (GskRenderNode *node1,
+                               GskRenderNode *node2)
 {
   return TRUE;
 }
@@ -1707,8 +1707,8 @@ gsk_container_node_draw (GskRenderNode *node,
 }
 
 static gboolean
-gsk_container_node_can_diff (const GskRenderNode *node1,
-                             const GskRenderNode *node2)
+gsk_container_node_can_diff (GskRenderNode *node1,
+                             GskRenderNode *node2)
 {
   return TRUE;
 }
@@ -1726,7 +1726,7 @@ gsk_render_node_add_to_region (GskRenderNode  *node,
 static int
 gsk_container_node_compare_func (gconstpointer elem1, gconstpointer elem2, gpointer data)
 {
-  return gsk_render_node_can_diff ((const GskRenderNode *) elem1, (const GskRenderNode *) elem2) ? 0 : 1;
+  return gsk_render_node_can_diff ((GskRenderNode *) elem1, (GskRenderNode *) elem2) ? 0 : 1;
 }
 
 static void
@@ -1918,8 +1918,8 @@ gsk_transform_node_draw (GskRenderNode *node,
 }
 
 static gboolean
-gsk_transform_node_can_diff (const GskRenderNode *node1,
-                             const GskRenderNode *node2)
+gsk_transform_node_can_diff (GskRenderNode *node1,
+                             GskRenderNode *node2)
 {
   GskTransformNode *self1 = (GskTransformNode *) node1;
   GskTransformNode *self2 = (GskTransformNode *) node2;
@@ -2092,8 +2092,8 @@ gsk_debug_node_draw (GskRenderNode *node,
 }
 
 static gboolean
-gsk_debug_node_can_diff (const GskRenderNode *node1,
-                         const GskRenderNode *node2)
+gsk_debug_node_can_diff (GskRenderNode *node1,
+                         GskRenderNode *node2)
 {
   GskDebugNode *self1 = (GskDebugNode *) node1;
   GskDebugNode *self2 = (GskDebugNode *) node2;

gsk/gskrendernodeprivate.h

@@ -28,8 +28,8 @@ struct _GskRenderNodeClass
   void            (* finalize)    (GskRenderNode  *node);
   void            (* draw)        (GskRenderNode  *node,
                                    cairo_t        *cr);
-  gboolean        (* can_diff)    (const GskRenderNode  *node1,
-                                   const GskRenderNode  *node2);
+  gboolean        (* can_diff)    (GskRenderNode  *node1,
+                                   GskRenderNode  *node2);
   void            (* diff)        (GskRenderNode  *node1,
                                    GskRenderNode  *node2,
                                    cairo_region_t *region);
@@ -38,8 +38,8 @@ struct _GskRenderNodeClass
 GskRenderNode * gsk_render_node_new              (const GskRenderNodeClass  *node_class,
                                                   gsize                      extra_size);
 
-gboolean        gsk_render_node_can_diff         (const GskRenderNode       *node1,
-                                                  const GskRenderNode       *node2) G_GNUC_PURE;
+gboolean        gsk_render_node_can_diff         (GskRenderNode             *node1,
+                                                  GskRenderNode             *node2);
 void            gsk_render_node_diff             (GskRenderNode             *node1,
                                                   GskRenderNode             *node2,
                                                   cairo_region_t            *region);

gsk/gskroundedrect.h

@@ -98,16 +98,16 @@ GskRoundedRect *        gsk_rounded_rect_shrink                 (GskRoundedRect
                                                                  float                     left);
 
 GDK_AVAILABLE_IN_ALL
-gboolean                gsk_rounded_rect_is_rectilinear         (const GskRoundedRect     *self) G_GNUC_PURE;
+gboolean                gsk_rounded_rect_is_rectilinear         (const GskRoundedRect     *self);
 GDK_AVAILABLE_IN_ALL
 gboolean                gsk_rounded_rect_contains_point         (const GskRoundedRect     *self,
-                                                                 const graphene_point_t   *point) G_GNUC_PURE;
+                                                                 const graphene_point_t   *point);
 GDK_AVAILABLE_IN_ALL
 gboolean                gsk_rounded_rect_contains_rect          (const GskRoundedRect     *self,
-                                                                 const graphene_rect_t    *rect) G_GNUC_PURE;
+                                                                 const graphene_rect_t    *rect);
 GDK_AVAILABLE_IN_ALL
 gboolean                gsk_rounded_rect_intersects_rect        (const GskRoundedRect     *self,
-                                                                 const graphene_rect_t    *rect) G_GNUC_PURE;
+                                                                 const graphene_rect_t    *rect);
 
 G_END_DECLS
 

gsk/gskroundedrectprivate.h

@@ -15,7 +15,7 @@ void                     gsk_rounded_rect_to_float              (const GskRounde
                                                                  float                     rect[12]);
 
 gboolean                 gsk_rounded_rect_equal                 (gconstpointer             rect1,
-                                                                 gconstpointer             rect2) G_GNUC_PURE;
+                                                                 gconstpointer             rect2);
 char *                   gsk_rounded_rect_to_string             (const GskRoundedRect     *self);
 
 

gsk/gsktransform.c

@@ -1773,62 +1773,6 @@ gsk_transform_transform_bounds (GskTransform          *self,
     }
 }
 
-/**
- * gsk_transform_transform_point:
- * @self: a #GskTransform
- * @point: a #graphene_point_t
- * @out_point: (out caller-allocates): return location for
- *   the transformed point
- *
- * Transforms a #graphene_point_t using the given transform @self.
- */
-void
-gsk_transform_transform_point (GskTransform           *self,
-                               const graphene_point_t *point,
-                               graphene_point_t       *out_point)
-{
-  switch (gsk_transform_get_category (self))
-    {
-    case GSK_TRANSFORM_CATEGORY_IDENTITY:
-      *out_point = *point;
-      break;
-
-    case GSK_TRANSFORM_CATEGORY_2D_TRANSLATE:
-      {
-        float dx, dy;
-
-        gsk_transform_to_translate (self, &dx, &dy);
-        out_point->x = point->x + dx;
-        out_point->y = point->y + dy;
-      }
-    break;
-
-    case GSK_TRANSFORM_CATEGORY_2D_AFFINE:
-      {
-        float dx, dy, scale_x, scale_y;
-
-        gsk_transform_to_affine (self, &scale_x, &scale_y, &dx, &dy);
-
-        out_point->x = (point->x * scale_x) + dx;
-        out_point->y = (point->y * scale_y) + dy;
-      }
-    break;
-
-    case GSK_TRANSFORM_CATEGORY_UNKNOWN:
-    case GSK_TRANSFORM_CATEGORY_ANY:
-    case GSK_TRANSFORM_CATEGORY_3D:
-    case GSK_TRANSFORM_CATEGORY_2D:
-    default:
-      {
-        graphene_matrix_t mat;
-
-        gsk_transform_to_matrix (self, &mat);
-        graphene_matrix_transform_point (&mat, point, out_point);
-      }
-      break;
-    }
-}
-
 static guint
 gsk_transform_parse_float (GtkCssParser *parser,
                            guint         n,

gsk/gsktransform.h

@@ -116,11 +116,6 @@ GDK_AVAILABLE_IN_ALL
 void                    gsk_transform_transform_bounds          (GskTransform                   *self,
                                                                  const graphene_rect_t          *rect,
                                                                  graphene_rect_t                *out_rect);
-GDK_AVAILABLE_IN_ALL
-void                    gsk_transform_transform_point           (GskTransform                   *self,
-                                                                 const graphene_point_t          *point,
-                                                                 graphene_point_t                *out_point);
-
 
 G_END_DECLS
 

gsk/meson.build

@@ -1,5 +1,4 @@
 gsk_private_gl_shaders = [
-  'resources/glsl/preamble.glsl',
   'resources/glsl/preamble.fs.glsl',
   'resources/glsl/preamble.vs.glsl',
   'resources/glsl/border.glsl',

gsk/resources/glsl/border.glsl

@@ -1,11 +1,7 @@
 // VERTEX_SHADER:
 uniform vec4 u_color;
-uniform vec4 u_widths;
-uniform vec4[3] u_outline_rect;
 
 _OUT_ vec4 final_color;
-_OUT_ _ROUNDED_RECT_UNIFORM_ transformed_outside_outline;
-_OUT_ _ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
@@ -13,32 +9,25 @@ void main() {
   final_color = u_color;
   final_color.rgb *= final_color.a; // pre-multiply
   final_color *= u_alpha;
-
-  RoundedRect outside = create_rect(u_outline_rect);
-  RoundedRect inside = rounded_rect_shrink (outside, u_widths);
-
-  rounded_rect_transform(outside, u_modelview);
-  rounded_rect_transform(inside, u_modelview);
-
-  rounded_rect_encode(outside, transformed_outside_outline);
-  rounded_rect_encode(inside, transformed_inside_outline);
 }
 
 // FRAGMENT_SHADER:
+uniform vec4 u_widths;
 uniform vec4[3] u_outline_rect;
 
 _IN_ vec4 final_color;
-_IN_ _ROUNDED_RECT_UNIFORM_ transformed_outside_outline;
-_IN_ _ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 
 void main() {
   vec4 f = gl_FragCoord;
   f.x += u_viewport.x;
   f.y = (u_viewport.y + u_viewport.w) - f.y;
 
-  float alpha = clamp(rounded_rect_coverage(decode_rect(transformed_outside_outline), f.xy) -
-                      rounded_rect_coverage(decode_rect(transformed_inside_outline), f.xy),
-                      0.0, 1.0);
+  RoundedRect outside = create_rect(u_outline_rect);
+  RoundedRect inside = rounded_rect_shrink (outside, u_widths);
+
+  float alpha = clamp (rounded_rect_coverage (outside, f.xy) -
+                       rounded_rect_coverage (inside, f.xy),
+                       0.0, 1.0);
 
   setOutputColor(final_color * alpha);
 }

gsk/resources/glsl/inset_shadow.glsl

@@ -1,12 +1,7 @@
 // VERTEX_SHADER:
 uniform vec4 u_color;
-uniform float u_spread;
-uniform vec2 u_offset;
-uniform vec4[3] u_outline_rect;
 
 _OUT_ vec4 final_color;
-_OUT_ _ROUNDED_RECT_UNIFORM_ transformed_outside_outline;
-_OUT_ _ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
@@ -14,33 +9,26 @@ void main() {
   final_color = u_color;
   final_color.rgb *= final_color.a;
   final_color *= u_alpha;
-
-  RoundedRect outside = create_rect(u_outline_rect);
-  RoundedRect inside = rounded_rect_shrink(outside, vec4(u_spread));
-
-  rounded_rect_offset(inside, u_offset);
-
-  rounded_rect_transform(outside, u_modelview);
-  rounded_rect_transform(inside, u_modelview);
-
-  rounded_rect_encode(outside, transformed_outside_outline);
-  rounded_rect_encode(inside, transformed_inside_outline);
 }
 
 // FRAGMENT_SHADER:
+uniform float u_spread;
+uniform vec2 u_offset;
+uniform vec4[3] u_outline_rect;
+
 _IN_ vec4 final_color;
-_IN_ _ROUNDED_RECT_UNIFORM_ transformed_outside_outline;
-_IN_ _ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 
 void main() {
   vec4 f = gl_FragCoord;
+  vec4 color;
 
   f.x += u_viewport.x;
   f.y = (u_viewport.y + u_viewport.w) - f.y;
 
-  float alpha = clamp (rounded_rect_coverage(decode_rect(transformed_outside_outline), f.xy) -
-                       rounded_rect_coverage(decode_rect(transformed_inside_outline), f.xy),
-                       0.0, 1.0);
-
-  setOutputColor(final_color * alpha);
+  RoundedRect outside = create_rect(u_outline_rect);
+  RoundedRect inside = rounded_rect_shrink(outside, vec4(u_spread));
+  color = final_color * clamp (rounded_rect_coverage (outside, f.xy) -
+                               rounded_rect_coverage (inside, f.xy - u_offset),
+                               0.0, 1.0);
+  setOutputColor(color);
 }

gsk/resources/glsl/outset_shadow.glsl

@@ -1,28 +1,12 @@
 // VERTEX_SHADER:
-uniform vec4 u_color;
-uniform vec4[3] u_outline_rect;
-
-_OUT_ vec4 final_color;
-_OUT_ _ROUNDED_RECT_UNIFORM_ transformed_outline;
-
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
 
   vUv = vec2(aUv.x, aUv.y);
-
-  final_color = u_color;
-  // pre-multiply
-  final_color.rgb *= final_color.a;
-  final_color *= u_alpha;
-
-  RoundedRect outline = create_rect(u_outline_rect);
-  rounded_rect_transform(outline, u_modelview);
-  rounded_rect_encode(outline, transformed_outline);
 }
 
 // FRAGMENT_SHADER:
-_IN_ vec4 final_color;
-_IN_ _ROUNDED_RECT_UNIFORM_ transformed_outline;
+uniform vec4[3] u_outline_rect;
 
 void main() {
   vec4 f = gl_FragCoord;
@@ -30,10 +14,8 @@ void main() {
   f.x += u_viewport.x;
   f.y = (u_viewport.y + u_viewport.w) - f.y;
 
-  float alpha = Texture(u_source, vUv).a;
-  alpha *= (1.0 -  clamp(rounded_rect_coverage(decode_rect(transformed_outline), f.xy), 0.0, 1.0));
-
-  vec4 color = final_color * alpha;
-
-  setOutputColor(color);
+  RoundedRect outline = create_rect(u_outline_rect);
+  vec4 color = Texture(u_source, vUv);
+  color = color * (1.0 -  clamp(rounded_rect_coverage(outline, f.xy), 0.0, 1.0));
+  setOutputColor(color * u_alpha);
 }

gsk/resources/glsl/preamble.fs.glsl

@@ -1,3 +1,12 @@
+#ifdef GSK_GL3
+precision highp float;
+#endif
+
+#ifdef GSK_GLES
+precision highp float;
+#endif
+
+
 uniform sampler2D u_source;
 uniform mat4 u_projection;
 uniform mat4 u_modelview;
@@ -6,23 +15,36 @@ uniform vec4 u_viewport;
 uniform vec4[3] u_clip_rect;
 
 #if GSK_GLES
+#define _OUT_ varying
+#define _IN_ varying
 #elif GSK_LEGACY
+#define _OUT_ varying
+#define _IN_ varying
 _OUT_ vec4 outputColor;
 #else
+#define _OUT_ out
+#define _IN_ in
 _OUT_ vec4 outputColor;
 #endif
-
 _IN_ vec2 vUv;
 
 
 
-RoundedRect decode_rect(_ROUNDED_RECT_UNIFORM_ r)
+struct RoundedRect
 {
-#if defined(GSK_GLES) || defined(GSK_LEGACY)
-  return RoundedRect(r[0], r[1], r[2]);
-#else
-  return r;
-#endif
+  vec4 bounds;
+  vec4 corner_widths;
+  vec4 corner_heights;
+};
+
+// Transform from a GskRoundedRect to a RoundedRect as we need it.
+RoundedRect
+create_rect(vec4 data[3])
+{
+  vec4 bounds = vec4(data[0].xy, data[0].xy + data[0].zw);
+  vec4 widths = vec4(data[1].x, data[1].z, data[2].x, data[2].z);
+  vec4 heights = vec4(data[1].y, data[1].w, data[2].y, data[2].w);
+  return RoundedRect(bounds, widths, heights);
 }
 
 float
@@ -51,15 +73,15 @@ rounded_rect_coverage (RoundedRect r, vec2 p)
       p.x >= r.bounds.z || p.y >= r.bounds.w)
     return 0.0;
 
-  vec2 rad_tl = r.corner_points1.xy - r.bounds.xy;
-  vec2 rad_tr = r.corner_points1.zw - r.bounds.zy;
-  vec2 rad_br = r.corner_points2.xy - r.bounds.zw;
-  vec2 rad_bl = r.corner_points2.zw - r.bounds.xw;
+  vec2 rad_tl = vec2(r.corner_widths.x, r.corner_heights.x);
+  vec2 rad_tr = vec2(r.corner_widths.y, r.corner_heights.y);
+  vec2 rad_br = vec2(r.corner_widths.z, r.corner_heights.z);
+  vec2 rad_bl = vec2(r.corner_widths.w, r.corner_heights.w);
 
-  vec2 ref_tl = r.corner_points1.xy;
-  vec2 ref_tr = r.corner_points1.zw;
-  vec2 ref_br = r.corner_points2.xy;
-  vec2 ref_bl = r.corner_points2.zw;
+  vec2 ref_tl = r.bounds.xy + vec2( r.corner_widths.x,  r.corner_heights.x);
+  vec2 ref_tr = r.bounds.zy + vec2(-r.corner_widths.y,  r.corner_heights.y);
+  vec2 ref_br = r.bounds.zw + vec2(-r.corner_widths.z, -r.corner_heights.z);
+  vec2 ref_bl = r.bounds.xw + vec2( r.corner_widths.w, -r.corner_heights.w);
 
   float d_tl = ellipsis_coverage(p, ref_tl, rad_tl);
   float d_tr = ellipsis_coverage(p, ref_tr, rad_tr);
@@ -76,8 +98,37 @@ rounded_rect_coverage (RoundedRect r, vec2 p)
   return 1.0 - dot(vec4(is_out), corner_coverages);
 }
 
+// amount is: top, right, bottom, left
+RoundedRect
+rounded_rect_shrink (RoundedRect r, vec4 amount)
+{
+  vec4 new_bounds = r.bounds + vec4(1.0,1.0,-1.0,-1.0) * amount.wxyz;
+  vec4 new_widths = vec4(0);
+  vec4 new_heights = vec4(0);
+
+  // Left top
+  if (r.corner_widths.x  > 0.0) new_widths.x = r.corner_widths.x - amount.w;
+  if (r.corner_heights.x > 0.0) new_heights.x = r.corner_heights.x - amount.x;
+
+  // Top right
+  if (r.corner_widths.y  > 0.0) new_widths.y = r.corner_widths.y - amount.y;
+  if (r.corner_heights.y > 0.0) new_heights.y = r.corner_heights.y - amount.x;
+
+  // Bottom right
+  if (r.corner_widths.z  > 0.0) new_widths.z = r.corner_widths.z - amount.y;
+  if (r.corner_heights.z > 0.0) new_heights.z = r.corner_heights.z - amount.z;
+
+  // Bottom left
+  if (r.corner_widths.w  > 0.0) new_widths.w = r.corner_widths.w - amount.w;
+  if (r.corner_heights.w > 0.0) new_heights.w = r.corner_heights.w - amount.z;
+
+  return RoundedRect (new_bounds, new_widths, new_heights);
+}
+
 vec4 Texture(sampler2D sampler, vec2 texCoords) {
-#if defined(GSK_GLES) || defined(GSK_LEGACY)
+#if GSK_GLES
+  return texture2D(sampler, texCoords);
+#elif GSK_LEGACY
   return texture2D(sampler, texCoords);
 #else
   return texture(sampler, texCoords);
@@ -90,10 +141,9 @@ void setOutputColor(vec4 color) {
   f.x += u_viewport.x;
   f.y = (u_viewport.y + u_viewport.w) - f.y;
 
-
-  // We do *NOT* transform the clip rect here since we already
-  // need to do that on the CPU.
-#if defined(GSK_GLES) || defined(GSK_LEGACY)
+#if GSK_GLES
+  gl_FragColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy);
+#elif GSK_LEGACY
   gl_FragColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy);
 #else
   outputColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy);

gsk/resources/glsl/preamble.glsl

@@ -1,37 +0,0 @@
-#ifndef GSK_LEGACY
-precision highp float;
-#endif
-
-#if defined(GSK_GLES) || defined(GSK_LEGACY)
-#define _OUT_ varying
-#define _IN_ varying
-#define _ROUNDED_RECT_UNIFORM_ vec4[3]
-#else
-#define _OUT_ out
-#define _IN_ in
-#define _ROUNDED_RECT_UNIFORM_ RoundedRect
-#endif
-
-
-struct RoundedRect
-{
-  vec4 bounds;
-  // Look, arrays can't be in structs if you want to return the struct
-  // from a function in gles or whatever. Just kill me.
-  vec4 corner_points1; // xy = top left, zw = top right
-  vec4 corner_points2; // xy = bottom right, zw = bottom left
-};
-
-// Transform from a GskRoundedRect to a RoundedRect as we need it.
-RoundedRect
-create_rect(vec4[3] data)
-{
-  vec4 bounds = vec4(data[0].xy, data[0].xy + data[0].zw);
-
-  vec4 corner_points1 = vec4(bounds.xy + data[1].xy,
-                             bounds.zy + vec2(data[1].zw * vec2(-1, 1)));
-  vec4 corner_points2 = vec4(bounds.zw + (data[2].xy * vec2(-1, -1)),
-                             bounds.xw + vec2(data[2].zw * vec2(1, -1)));
-
-  return RoundedRect(bounds, corner_points1, corner_points2);
-}

gsk/resources/glsl/preamble.vs.glsl

@@ -2,68 +2,26 @@ uniform mat4 u_projection;
 uniform mat4 u_modelview;
 uniform float u_alpha;
 
-#if defined(GSK_GLES) || defined(GSK_LEGACY)
+#ifdef GSK_GLES
+precision highp float;
+#endif
+
+#if GSK_GLES
+#define _OUT_ varying
+#define _IN_ varying
+attribute vec2 aPosition;
+attribute vec2 aUv;
+_OUT_ vec2 vUv;
+#elif GSK_LEGACY
+#define _OUT_ varying
+#define _IN_ varying
 attribute vec2 aPosition;
 attribute vec2 aUv;
 _OUT_ vec2 vUv;
 #else
+#define _OUT_ out
+#define _IN_ in
 _IN_ vec2 aPosition;
 _IN_ vec2 aUv;
 _OUT_ vec2 vUv;
 #endif
-
-// amount is: top, right, bottom, left
-RoundedRect
-rounded_rect_shrink (RoundedRect r, vec4 amount)
-{
-  vec4 new_bounds = r.bounds + vec4(1.0,1.0,-1.0,-1.0) * amount.wxyz;
-  vec4 new_corner_points1 = r.corner_points1;
-  vec4 new_corner_points2 = r.corner_points2;
-
-  if (r.corner_points1.xy == r.bounds.xy) new_corner_points1.xy = new_bounds.xy;
-  if (r.corner_points1.zw == r.bounds.zy) new_corner_points1.zw = new_bounds.zy;
-  if (r.corner_points2.xy == r.bounds.zw) new_corner_points2.xy = new_bounds.zw;
-  if (r.corner_points2.zw == r.bounds.xw) new_corner_points2.zw = new_bounds.xw;
-
-  return RoundedRect (new_bounds, new_corner_points1, new_corner_points2);
-}
-
-void
-rounded_rect_offset(inout RoundedRect r, vec2 offset)
-{
-  r.bounds.xy += offset;
-  r.bounds.zw += offset;
-  r.corner_points1.xy += offset;
-  r.corner_points1.zw += offset;
-  r.corner_points2.xy += offset;
-  r.corner_points2.zw += offset;
-}
-
-void rounded_rect_transform(inout RoundedRect r, mat4 mat)
-{
-  r.bounds.xy = (mat * vec4(r.bounds.xy, 0.0, 1.0)).xy;
-  r.bounds.zw = (mat * vec4(r.bounds.zw, 0.0, 1.0)).xy;
-
-  r.corner_points1.xy = (mat * vec4(r.corner_points1.xy, 0.0, 1.0)).xy;
-  r.corner_points1.zw = (mat * vec4(r.corner_points1.zw, 0.0, 1.0)).xy;
-
-  r.corner_points2.xy = (mat * vec4(r.corner_points2.xy, 0.0, 1.0)).xy;
-  r.corner_points2.zw = (mat * vec4(r.corner_points2.zw, 0.0, 1.0)).xy;
-}
-
-#if defined(GSK_LEGACY)
-// Can't have out or inout array parameters...
-#define rounded_rect_encode(r, uni) uni[0] = r.bounds; uni[1] = r.corner_points1; uni[2] = r.corner_points2;
-#else
-void rounded_rect_encode(RoundedRect r, out _ROUNDED_RECT_UNIFORM_ out_r)
-{
-#if defined(GSK_GLES)
-  out_r[0] = r.bounds;
-  out_r[1] = r.corner_points1;
-  out_r[2] = r.corner_points2;
-#else
-  out_r = r;
-#endif
-}
-
-#endif

gsk/resources/glsl/unblurred_outset_shadow.glsl

@@ -1,12 +1,7 @@
 // VERTEX_SHADER:
 uniform vec4 u_color;
-uniform float u_spread;
-uniform vec2 u_offset;
-uniform vec4[3] u_outline_rect;
 
 _OUT_ vec4 final_color;
-_OUT_ _ROUNDED_RECT_UNIFORM_ transformed_outside_outline;
-_OUT_ _ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
@@ -14,33 +9,26 @@ void main() {
   final_color = u_color;
   final_color.rgb *= final_color.a;
   final_color *= u_alpha;
-
-  RoundedRect inside = create_rect(u_outline_rect);
-  RoundedRect outside = rounded_rect_shrink(inside, vec4(- u_spread));
-
-  rounded_rect_offset(outside, u_offset);
-
-  rounded_rect_transform(outside, u_modelview);
-  rounded_rect_transform(inside, u_modelview);
-
-  rounded_rect_encode(outside, transformed_outside_outline);
-  rounded_rect_encode(inside, transformed_inside_outline);
 }
 
 // FRAGMENT_SHADER:
+uniform float u_spread;
+uniform vec2 u_offset;
+uniform vec4[3] u_outline_rect;
+
 _IN_ vec4 final_color;
-_IN_ _ROUNDED_RECT_UNIFORM_ transformed_outside_outline;
-_IN_ _ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 
 void main() {
   vec4 f = gl_FragCoord;
+  vec4 color;
 
   f.x += u_viewport.x;
   f.y = (u_viewport.y + u_viewport.w) - f.y;
 
-  float alpha = clamp(rounded_rect_coverage(decode_rect(transformed_outside_outline), f.xy) -
-                      rounded_rect_coverage(decode_rect(transformed_inside_outline), f.xy),
-                      0.0, 1.0);
-
-  setOutputColor(final_color * alpha);
+  RoundedRect inside = create_rect(u_outline_rect);
+  RoundedRect outside = rounded_rect_shrink(inside, vec4(- u_spread));
+  color = final_color * clamp (rounded_rect_coverage (outside, f.xy - u_offset) -
+                               rounded_rect_coverage (inside, f.xy),
+                               0.0, 1.0);
+  setOutputColor(color);
 }

gtk/css/gtkcssparser.c

@@ -261,14 +261,14 @@ gtk_css_parser_get_end_location (GtkCssParser *self)
 const GtkCssLocation *
 gtk_css_parser_get_block_location (GtkCssParser *self)
 {
-  const GtkCssParserBlock *block;
+  GtkCssParserBlock *block;
 
   if (self->blocks->len == 0)
     {
       static const GtkCssLocation start_of_document = { 0, };
       return &start_of_document;
     }
-
+  
   block = &g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1);
   return &block->start_location;
 }
@@ -301,7 +301,7 @@ gtk_css_parser_peek_token (GtkCssParser *self)
 
   if (self->blocks->len)
     {
-      const GtkCssParserBlock *block = &g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1);
+      GtkCssParserBlock *block = &g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1);
       if (gtk_css_token_is (&self->token, block->end_token) ||
           gtk_css_token_is (&self->token, block->inherited_end_token) ||
           gtk_css_token_is (&self->token, block->alternative_token))

gtk/css/gtkcsstokenizerprivate.h

@@ -109,16 +109,16 @@ union _GtkCssToken {
 
 void                    gtk_css_token_clear                     (GtkCssToken            *token);
 
-gboolean                gtk_css_token_is_finite                 (const GtkCssToken      *token) G_GNUC_PURE;
+gboolean                gtk_css_token_is_finite                 (const GtkCssToken      *token);
 gboolean                gtk_css_token_is_preserved              (const GtkCssToken      *token,
-                                                                 GtkCssTokenType        *out_closing) G_GNUC_PURE;
+                                                                 GtkCssTokenType        *out_closing);
 #define gtk_css_token_is(token, _type) ((token)->type == (_type))
 gboolean                gtk_css_token_is_ident                  (const GtkCssToken      *token,
-                                                                 const char             *ident) G_GNUC_PURE;
+                                                                 const char             *ident);
 gboolean                gtk_css_token_is_function               (const GtkCssToken      *token,
-                                                                 const char             *ident) G_GNUC_PURE;
+                                                                 const char             *ident);
 gboolean                gtk_css_token_is_delim                  (const GtkCssToken      *token,
-                                                                 gunichar                delim) G_GNUC_PURE;
+                                                                 gunichar                delim);
 
 void                    gtk_css_token_print                     (const GtkCssToken      *token,
                                                                  GString                *string);

gtk/gen-gtk-gresources-xml.py

@@ -17,7 +17,6 @@ def get_files(subdir,extension):
   return sorted(filter(lambda x: x.endswith((extension)), os.listdir(os.path.join(srcdir,subdir))))
 
 xml += '''
-    <file>theme/Empty/gtk.css</file>
     <file>theme/Adwaita/gtk.css</file>
     <file>theme/Adwaita/gtk-dark.css</file>
     <file>theme/Adwaita/gtk-contained.css</file>

gtk/gskpango.c

@@ -23,11 +23,9 @@
 #include "gsk/gskrendernodeprivate.h"
 #include "gskpango.h"
 #include "gtksnapshotprivate.h"
+#include "gtkstylecontextprivate.h"
 #include "gtktextlayoutprivate.h"
 #include "gtktextviewprivate.h"
-#include "gtkwidgetprivate.h"
-#include "gtkcssnodeprivate.h"
-#include "gtkcsscolorvalueprivate.h"
 
 #include <math.h>
 
@@ -309,6 +307,7 @@ static void
 gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
                                 PangoLayoutRun *run)
 {
+  GtkStyleContext *context;
   GskPangoRenderer *crenderer = GSK_PANGO_RENDERER (renderer);
   GdkRGBA *bg_rgba = NULL;
   GdkRGBA *fg_rgba = NULL;
@@ -321,6 +320,8 @@ gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
   if (appearance == NULL)
     return;
 
+  context = gtk_widget_get_style_context (crenderer->widget);
+
   if (appearance->draw_bg && crenderer->state == GSK_PANGO_RENDERER_NORMAL)
     bg_rgba = appearance->bg_rgba;
   else
@@ -331,21 +332,22 @@ gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
   if (crenderer->state == GSK_PANGO_RENDERER_SELECTED &&
       GTK_IS_TEXT_VIEW (crenderer->widget))
     {
-      GtkCssNode *node;
-      GtkCssValue *value;
+      GtkCssNode *selection_node;
 
-      node = gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget);
-      value = gtk_css_style_get_value (gtk_css_node_get_style (node), GTK_CSS_PROPERTY_COLOR);
-      fg_rgba = (GdkRGBA *)gtk_css_color_value_get_rgba (value);
+      selection_node = gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget);
+      gtk_style_context_save_to_node (context, selection_node);
+
+      gtk_style_context_get (context,
+                             "color", &fg_rgba,
+                             NULL);
+
+      gtk_style_context_restore (context);
     }
   else if (crenderer->state == GSK_PANGO_RENDERER_CURSOR && gtk_widget_has_focus (crenderer->widget))
     {
-      GtkCssNode *node;
-      GtkCssValue *value;
-
-      node = gtk_widget_get_css_node (crenderer->widget);
-      value = gtk_css_style_get_value (gtk_css_node_get_style (node), GTK_CSS_PROPERTY_BACKGROUND_COLOR);
-      fg_rgba = (GdkRGBA *)gtk_css_color_value_get_rgba (value);
+      gtk_style_context_get (context,
+                             "background-color", &fg_rgba,
+                             NULL);
     }
   else
     fg_rgba = appearance->fg_rgba;

gtk/gtk.h

@@ -90,8 +90,8 @@
 #include <gtk/gtkcustomlayout.h>
 #include <gtk/gtkdebug.h>
 #include <gtk/gtkdialog.h>
+#include <gtk/gtkdnd.h>
 #include <gtk/gtkdragdest.h>
-#include <gtk/gtkdragicon.h>
 #include <gtk/gtkdragsource.h>
 #include <gtk/gtkdrawingarea.h>
 #include <gtk/gtkeditable.h>

gtk/gtkapplication.c

@@ -297,25 +297,17 @@ gtk_application_startup (GApplication *g_application)
 {
   GtkApplication *application = GTK_APPLICATION (g_application);
   GtkApplicationPrivate *priv = gtk_application_get_instance_private (application);
-  gint64 before = g_get_monotonic_time ();
-  gint64 before2;
 
   G_APPLICATION_CLASS (gtk_application_parent_class)->startup (g_application);
 
   gtk_action_muxer_insert (priv->muxer, "app", G_ACTION_GROUP (application));
 
-  before2 = g_get_monotonic_time ();
   gtk_init ();
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before2 * 1000, (g_get_monotonic_time () - before2) * 1000, "gtk init", NULL);
 
   priv->impl = gtk_application_impl_new (application, gdk_display_get_default ());
   gtk_application_impl_startup (priv->impl, priv->register_session);
 
   gtk_application_load_resources (application);
-
-  if (gdk_profiler_is_running ())
-    gdk_profiler_add_mark (before * 1000, (g_get_monotonic_time () - before) * 1000, "gtk application startup", NULL);
 }
 
 static void

gtk/gtkbox.c

@@ -109,6 +109,9 @@ static void gtk_box_forall             (GtkContainer   *container,
                                         GtkCallback     callback,
                                         gpointer        callback_data);
 static GType gtk_box_child_type        (GtkContainer   *container);
+static GtkWidgetPath * gtk_box_get_path_for_child
+                                       (GtkContainer   *container,
+                                        GtkWidget      *child);
 
 G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
                          G_ADD_PRIVATE (GtkBox)
@@ -128,6 +131,7 @@ gtk_box_class_init (GtkBoxClass *class)
   container_class->remove = gtk_box_remove;
   container_class->forall = gtk_box_forall;
   container_class->child_type = gtk_box_child_type;
+  container_class->get_path_for_child = gtk_box_get_path_for_child;
 
   g_object_class_override_property (object_class,
                                     PROP_ORIENTATION,
@@ -238,6 +242,105 @@ gtk_box_child_type (GtkContainer   *container)
   return GTK_TYPE_WIDGET;
 }
 
+typedef struct _CountingData CountingData;
+struct _CountingData {
+  GtkWidget *widget;
+  gboolean found;
+  guint before;
+  guint after;
+};
+
+static void
+count_widget_position (GtkWidget *widget,
+                       gpointer   data)
+{
+  CountingData *count = data;
+
+  if (!_gtk_widget_get_visible (widget))
+    return;
+
+  if (count->widget == widget)
+    count->found = TRUE;
+  else if (count->found)
+    count->after++;
+  else
+    count->before++;
+}
+
+static gint
+gtk_box_get_visible_position (GtkBox    *box,
+                              GtkWidget *child)
+{
+  CountingData count = { child, FALSE, 0, 0 };
+  GtkBoxPrivate *priv = gtk_box_get_instance_private (box);
+
+  /* foreach iterates in visible order */
+  gtk_container_foreach (GTK_CONTAINER (box),
+                         count_widget_position,
+                         &count);
+
+  /* the child wasn't found, it's likely an internal child of some
+   * subclass, return -1 to indicate that there is no sibling relation
+   * to the regular box children
+   */
+  if (!count.found)
+    return -1;
+
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
+      gtk_widget_get_direction (GTK_WIDGET (box)) == GTK_TEXT_DIR_RTL)
+    return count.after;
+  else
+    return count.before;
+}
+
+static GtkWidgetPath *
+gtk_box_get_path_for_child (GtkContainer *container,
+                            GtkWidget    *child)
+{
+  GtkWidgetPath *path, *sibling_path;
+  GtkBox *box = GTK_BOX (container);
+  GtkBoxPrivate *priv = gtk_box_get_instance_private (box);
+  GList *list, *children;
+
+  path = _gtk_widget_create_path (GTK_WIDGET (container));
+
+  if (_gtk_widget_get_visible (child))
+    {
+      gint position;
+
+      sibling_path = gtk_widget_path_new ();
+
+      /* get_children works in visible order */
+      children = gtk_container_get_children (container);
+      if (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
+          _gtk_widget_get_direction (GTK_WIDGET (box)) == GTK_TEXT_DIR_RTL)
+        children = g_list_reverse (children);
+
+      for (list = children; list; list = list->next)
+        {
+          if (!_gtk_widget_get_visible (list->data))
+            continue;
+
+          gtk_widget_path_append_for_widget (sibling_path, list->data);
+        }
+
+      g_list_free (children);
+
+      position = gtk_box_get_visible_position (box, child);
+
+      if (position >= 0)
+        gtk_widget_path_append_with_siblings (path, sibling_path, position);
+      else
+        gtk_widget_path_append_for_widget (path, child);
+
+      gtk_widget_path_unref (sibling_path);
+    }
+  else
+    gtk_widget_path_append_for_widget (path, child);
+
+  return path;
+}
+
 static void
 gtk_box_init (GtkBox *box)
 {

gtk/gtkbuilderscope.c

@@ -412,7 +412,7 @@ gtk_builder_cscope_init (GtkBuilderCScope *self)
  * Calling this function is only necessary if you want to add custom
  * callbacks via gtk_builder_cscope_add_callback_symbol().
  *
- * Returns: (transfer full): a new #GtkBuilderCScope
+ * Returns: a new #GtkBuilderCScope
  **/
 GtkBuilderScope *
 gtk_builder_cscope_new (void)
@@ -502,7 +502,7 @@ gtk_builder_cscope_add_callback_symbols (GtkBuilderCScope *self,
  * Fetches a symbol previously added to @self
  * with gtk_builder_cscope_add_callback_symbol().
  *
- * Returns: (nullable) (transfer none): The callback symbol in @builder for @callback_name, or %NULL
+ * Returns: (nullable): The callback symbol in @builder for @callback_name, or %NULL
  */
 GCallback
 gtk_builder_cscope_lookup_callback_symbol (GtkBuilderCScope *self,

gtk/gtkcalendar.c

@@ -72,6 +72,7 @@
 #endif
 
 #include "gtkcalendar.h"
+#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
@@ -86,10 +87,6 @@
 #include "gtkgesturedrag.h"
 #include "gtkeventcontrollerscroll.h"
 #include "gtkeventcontrollerkey.h"
-#include "gtkdragsource.h"
-#include "gtknative.h"
-#include "gtkicontheme.h"
-#include "gtkdragicon.h"
 
 #define TIMEOUT_INITIAL  500
 #define TIMEOUT_REPEAT    50
@@ -251,6 +248,7 @@ struct _GtkCalendarPrivate
   guint need_timer  : 1;
 
   guint in_drag : 1;
+  guint drag_highlight : 1;
 
   guint32 timer;
   gint click_child;
@@ -331,17 +329,22 @@ static gboolean gtk_calendar_query_tooltip  (GtkWidget        *widget,
                                              gboolean          keyboard_mode,
                                              GtkTooltip       *tooltip);
 
-static gboolean gtk_calendar_drag_accept        (GtkDropTarget    *dest,
+static void     gtk_calendar_drag_data_get      (GtkWidget        *widget,
+                                                 GdkDrag          *drag, 
+                                                 GtkSelectionData *selection_data);
+static void     gtk_calendar_drag_data_received (GtkWidget        *widget,
                                                  GdkDrop          *drop,
-                                                 GtkCalendar      *calendar);
-static void     gtk_calendar_drag_leave         (GtkDropTarget    *dest,
+                                                 GtkSelectionData *selection_data);
+static gboolean gtk_calendar_drag_motion        (GtkWidget        *widget,
                                                  GdkDrop          *drop,
-                                                 GtkCalendar      *calendar);
-static gboolean gtk_calendar_drag_drop          (GtkDropTarget    *dest,
+                                                 gint              x,
+                                                 gint              y);
+static void     gtk_calendar_drag_leave         (GtkWidget        *widget,
+                                                 GdkDrop          *drop);
+static gboolean gtk_calendar_drag_drop          (GtkWidget        *widget,
                                                  GdkDrop          *drop,
-                                                 int               x,
-                                                 int               y,
-                                                 GtkCalendar      *calendar);
+                                                 gint              x,
+                                                 gint              y);
 
 
 static void calendar_start_spinning (GtkCalendar *calendar,
@@ -389,6 +392,12 @@ gtk_calendar_class_init (GtkCalendarClass *class)
   widget_class->grab_notify = gtk_calendar_grab_notify;
   widget_class->query_tooltip = gtk_calendar_query_tooltip;
 
+  widget_class->drag_data_get = gtk_calendar_drag_data_get;
+  widget_class->drag_motion = gtk_calendar_drag_motion;
+  widget_class->drag_leave = gtk_calendar_drag_leave;
+  widget_class->drag_drop = gtk_calendar_drag_drop;
+  widget_class->drag_data_received = gtk_calendar_drag_data_received;
+
   /**
    * GtkCalendar:year:
    *
@@ -666,8 +675,6 @@ gtk_calendar_init (GtkCalendar *calendar)
 #else
   gchar *week_start;
 #endif
-  GdkContentFormats *formats;
-  GtkDropTarget *dest;
 
   gtk_widget_set_can_focus (widget, TRUE);
 
@@ -785,17 +792,11 @@ gtk_calendar_init (GtkCalendar *calendar)
   priv->click_child = -1;
 
   priv->in_drag = 0;
+  priv->drag_highlight = 0;
 
-  formats = gdk_content_formats_new_for_gtype (G_TYPE_STRING);
-  dest = gtk_drop_target_new (formats, GDK_ACTION_COPY);
-  gdk_content_formats_unref (formats);
+  gtk_drag_dest_set (widget, 0, NULL, GDK_ACTION_COPY);
+  gtk_drag_dest_add_text_targets (widget);
 
-  g_signal_connect (dest, "accept", G_CALLBACK (gtk_calendar_drag_accept), calendar);
-  g_signal_connect (dest, "drag-leave", G_CALLBACK (gtk_calendar_drag_leave), calendar);
-  g_signal_connect (dest, "drag-drop", G_CALLBACK (gtk_calendar_drag_drop), calendar);
-
-  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (dest));
-  
   priv->year_before = 0;
 
   /* Translate to calendar:YM if you want years to be displayed
@@ -2394,6 +2395,7 @@ calendar_snapshot_arrow (GtkCalendar *calendar,
 {
   GtkWidget *widget = GTK_WIDGET (calendar);
   GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
+  GtkCssImageBuiltinType image_type;
   GtkStyleContext *context;
   GtkStateFlags state;
   GdkRectangle rect;
@@ -2416,11 +2418,19 @@ calendar_snapshot_arrow (GtkCalendar *calendar,
                                   rect.x, rect.y,
                                   rect.width, rect.height);
 
+  if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
+    image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT;
+  else
+    image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT;
+
   gtk_snapshot_save (snapshot);
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT(
                           rect.x + (rect.width - 8) / 2,
                           rect.y + (rect.height - 8) / 2));
-  gtk_css_style_snapshot_icon (gtk_style_context_lookup_style (context), snapshot, 8, 8);
+  gtk_css_style_snapshot_icon (gtk_style_context_lookup_style (context),
+                               snapshot,
+                               8, 8,
+                               image_type);
   gtk_snapshot_restore (snapshot);
 
   gtk_style_context_restore (context);
@@ -2660,27 +2670,6 @@ gtk_calendar_drag_begin (GtkGestureDrag *gesture,
   priv->in_drag = TRUE;
 }
 
-static GdkContentProvider *
-get_calendar_content (GtkCalendar *calendar)
-{
-  GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
-  GDate *date;
-  gchar str[128];
-  GValue value = G_VALUE_INIT;
-  GdkContentProvider *content;
-
-  date = g_date_new_dmy (priv->selected_day, priv->month + 1, priv->year);
-  g_date_strftime (str, 127, "%x", date);
-  g_free (date);
-
-  g_value_init (&value, G_TYPE_STRING);
-  g_value_set_string (&value, str);
-  content = gdk_content_provider_new_for_value (&value);
-  g_value_unset (&value);
-
-  return content;
-}
-
 static void
 gtk_calendar_drag_update (GtkGestureDrag *gesture,
                           double          x,
@@ -2691,12 +2680,8 @@ gtk_calendar_drag_update (GtkGestureDrag *gesture,
   GtkCalendar *calendar = GTK_CALENDAR (widget);
   GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
   gdouble start_x, start_y;
-  GdkContentProvider *content;
-  GdkDevice *device;
   GdkDrag *drag;
-  GtkIconTheme *theme;
-  GdkPaintable *paintable;
-  GdkSurface *surface;
+  GdkContentFormats *targets;
 
   if (!priv->in_drag)
     return;
@@ -2706,22 +2691,19 @@ gtk_calendar_drag_update (GtkGestureDrag *gesture,
 
   gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y);
 
-  surface = gtk_native_get_surface (gtk_widget_get_native (widget));
-  device = gtk_gesture_get_device (GTK_GESTURE (gesture));
+  gtk_event_controller_reset (GTK_EVENT_CONTROLLER (gesture));
 
-  content = get_calendar_content (calendar);
-
-  drag = gdk_drag_begin (surface, device, content, GDK_ACTION_COPY, start_x, start_y);
-
-  theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
-  paintable = gtk_icon_theme_load_icon (theme, "text-x-generic", 32, 0, NULL);
-  gtk_drag_icon_set_from_paintable (drag, paintable, 0, 0);
-  g_clear_object (&paintable);
-
-  g_object_unref (content);
-  g_object_unref (drag);
+  targets = gdk_content_formats_new (NULL, 0);
+  targets = gtk_content_formats_add_text_targets (targets);
+  drag = gtk_drag_begin (widget,
+                         gtk_gesture_get_device (GTK_GESTURE (gesture)),
+                         targets, GDK_ACTION_COPY,
+                         start_x, start_y);
 
   priv->in_drag = 0;
+  gdk_content_formats_unref (targets);
+
+  gtk_drag_set_icon_default (drag);
 }
 
 static gboolean
@@ -2941,6 +2923,24 @@ gtk_calendar_grab_notify (GtkWidget *widget,
  *          Drag and Drop               *
  ****************************************/
 
+static void
+gtk_calendar_drag_data_get (GtkWidget        *widget,
+                            GdkDrag          *drag,
+                            GtkSelectionData *selection_data)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
+  GDate *date;
+  gchar str[128];
+  gsize len;
+
+  date = g_date_new_dmy (priv->selected_day, priv->month + 1, priv->year);
+  len = g_date_strftime (str, 127, "%x", date);
+  gtk_selection_data_set_text (selection_data, str, len);
+
+  g_free (date);
+}
+
 /* Get/set whether drag_motion requested the drag data and
  * drag_data_received should thus not actually insert the data,
  * since the data doesn’t result from a drop.
@@ -2962,33 +2962,87 @@ get_status_pending (GdkDrop *drop)
 }
 
 static void
-gtk_calendar_drag_leave (GtkDropTarget *dest,
-                         GdkDrop       *drop,
-                         GtkCalendar   *calendar)
+gtk_calendar_drag_leave (GtkWidget *widget,
+                         GdkDrop   *drop)
 {
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
+
+  priv->drag_highlight = 0;
+  gtk_drag_unhighlight (widget);
+}
+
+static gboolean
+gtk_calendar_drag_motion (GtkWidget      *widget,
+                          GdkDrop        *drop,
+                          gint            x,
+                          gint            y)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
+  GdkAtom target;
+
+  if (!priv->drag_highlight)
+    {
+      priv->drag_highlight = 1;
+      gtk_drag_highlight (widget);
+    }
+
+  target = gtk_drag_dest_find_target (widget, drop, NULL);
+  if (target == NULL || gdk_drop_get_actions (drop) == 0)
+    gdk_drop_status (drop, 0);
+  else if (get_status_pending (drop) == 0)
+    {
+      set_status_pending (drop, gdk_drop_get_actions (drop));
+      gtk_drag_get_data (widget, drop, target);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gtk_calendar_drag_drop (GtkWidget      *widget,
+                        GdkDrop        *drop,
+                        gint            x,
+                        gint            y)
+{
+  GdkAtom target;
+
+  target = gtk_drag_dest_find_target (widget, drop, NULL);
+  if (target != NULL)
+    {
+      gtk_drag_get_data (widget, drop, target);
+      return TRUE;
+    }
+
+  return FALSE;
 }
 
 static void
-got_text (GObject      *source,
-          GAsyncResult *result,
-          gpointer      data)
+gtk_calendar_drag_data_received (GtkWidget        *widget,
+                                 GdkDrop          *drop,
+                                 GtkSelectionData *selection_data)
 {
-  GtkDropTarget *dest = GTK_DROP_TARGET (data);
-  GtkCalendar *calendar = GTK_CALENDAR (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest)));
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
   GtkCalendarPrivate *priv = gtk_calendar_get_instance_private (calendar);
-  GdkDrop *drop = GDK_DROP (source);
   guint day, month, year;
   gchar *str;
   GDate *date;
   GdkDragAction suggested_action;
 
   suggested_action = get_status_pending (drop);
-  set_status_pending (drop, 0);
-
-  str = gdk_drop_read_text_finish (drop, result, NULL);
 
   if (suggested_action)
     {
+      set_status_pending (drop, 0);
+
+      /* We are getting this data due to a request in drag_motion,
+       * rather than due to a request in drag_drop, so we are just
+       * supposed to call drag_status, not actually paste in the
+       * data.
+       */
+      str = (gchar*) gtk_selection_data_get_text (selection_data);
+
       if (str)
         {
           date = g_date_new ();
@@ -3000,13 +3054,14 @@ got_text (GObject      *source,
         }
       else
         suggested_action = 0;
+
       gdk_drop_status (drop, suggested_action);
-      if (suggested_action == 0)
-        gtk_drop_target_deny_drop (dest, drop);
+
       return;
     }
 
   date = g_date_new ();
+  str = (gchar*) gtk_selection_data_get_text (selection_data);
   if (str)
     {
       g_date_set_parse (date, str);
@@ -3018,7 +3073,6 @@ got_text (GObject      *source,
       g_warning ("Received invalid date data");
       g_date_free (date);
       gdk_drop_finish (drop, 0);
-      gtk_drop_target_deny_drop (dest, drop);
       return;
     }
 
@@ -3029,6 +3083,7 @@ got_text (GObject      *source,
 
   gdk_drop_finish (drop, suggested_action);
 
+
   g_object_freeze_notify (G_OBJECT (calendar));
   if (!(priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
       && (priv->display_flags & GTK_CALENDAR_SHOW_HEADING))
@@ -3037,47 +3092,6 @@ got_text (GObject      *source,
   g_object_thaw_notify (G_OBJECT (calendar));
 }
 
-static gboolean
-gtk_calendar_drag_accept (GtkDropTarget *dest,
-                          GdkDrop       *drop,
-                          GtkCalendar   *calendar)
-{
-  GdkAtom target;
-
-  target = gtk_drop_target_find_mimetype (dest);
-  if (!target || gdk_drop_get_actions (drop) == 0)
-    {
-      gdk_drop_status (drop, 0);
-      return FALSE;
-    }
-  else if (get_status_pending (drop) == 0)
-    {
-      set_status_pending (drop, gdk_drop_get_actions (drop));
-      gdk_drop_read_text_async (drop, NULL, got_text, dest);
-    }
-  return TRUE;
-}
-
-static gboolean
-gtk_calendar_drag_drop (GtkDropTarget  *dest,
-                        GdkDrop        *drop,
-                        int             x,
-                        int             y,
-                        GtkCalendar    *calendar)
-{
-  GdkAtom target;
-
-  target = gtk_drop_target_find_mimetype (dest);
-  if (target != NULL)
-    {
-      set_status_pending (drop, 0);
-      gdk_drop_read_text_async (drop, NULL, got_text, dest);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 
 /****************************************
  *              Public API              *

gtk/gtkcellrenderertoggle.c

@@ -406,6 +406,7 @@ gtk_cell_renderer_toggle_snapshot (GtkCellRenderer      *cell,
   gint xpad, ypad;
   GtkStateFlags state;
   GtkBorder padding, border;
+  GtkCssImageBuiltinType image_type;
 
   gtk_cell_renderer_toggle_get_size (cell, widget, cell_area,
 				     &x_offset, &y_offset,
@@ -451,12 +452,32 @@ gtk_cell_renderer_toggle_snapshot (GtkCellRenderer      *cell,
   gtk_style_context_get_padding (context, &padding);
   gtk_style_context_get_border (context, &border);
 
+  if (priv->radio)
+    {
+      if (state & GTK_STATE_FLAG_INCONSISTENT)
+        image_type = GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT;
+      else if (state & GTK_STATE_FLAG_CHECKED)
+        image_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
+      else
+        image_type = GTK_CSS_IMAGE_BUILTIN_NONE;
+    }
+  else
+    {
+      if (state & GTK_STATE_FLAG_INCONSISTENT)
+        image_type = GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT;
+      else if (state & GTK_STATE_FLAG_CHECKED)
+        image_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
+      else
+        image_type = GTK_CSS_IMAGE_BUILTIN_NONE;
+    }
+
   gtk_snapshot_translate (snapshot,
                           &GRAPHENE_POINT_INIT (cell_area->x + x_offset + xpad + padding.left + border.left,
                                                 cell_area->y + y_offset + ypad + padding.top + border.top));
   gtk_css_style_snapshot_icon (gtk_style_context_lookup_style (context), snapshot,
                                width - padding.left - padding.right - border.left - border.right,
-                               height - padding.top - padding.bottom - border.top - border.bottom);
+                               height - padding.top - padding.bottom - border.top - border.bottom,
+                               image_type);
 
   gtk_style_context_restore (context);
   gtk_snapshot_pop (snapshot);

gtk/gtkcheckbutton.c

@@ -98,6 +98,7 @@ static void
 gtk_check_button_update_node_state (GtkWidget *widget)
 {
   GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (GTK_CHECK_BUTTON (widget));
+  GtkCssImageBuiltinType image_type;
   GtkStateFlags state;
 
   if (!priv->indicator_widget)
@@ -105,6 +106,17 @@ gtk_check_button_update_node_state (GtkWidget *widget)
 
   state = gtk_widget_get_state_flags (widget);
 
+  /* XXX: This is somewhat awkward here, but there's no better
+   * way to update the icon
+   */
+  if (state & GTK_STATE_FLAG_CHECKED)
+    image_type = GTK_IS_RADIO_BUTTON (widget) ? GTK_CSS_IMAGE_BUILTIN_OPTION : GTK_CSS_IMAGE_BUILTIN_CHECK;
+  else if (state & GTK_STATE_FLAG_INCONSISTENT)
+    image_type = GTK_IS_RADIO_BUTTON (widget) ? GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT : GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT;
+  else
+    image_type = GTK_CSS_IMAGE_BUILTIN_NONE;
+
+  gtk_icon_set_image (GTK_ICON (priv->indicator_widget), image_type);
   gtk_widget_set_state_flags (priv->indicator_widget, state, TRUE);
 }
 

gtk/gtkcolorbutton.c

@@ -36,6 +36,7 @@
 #include "gtkcolorchooserprivate.h"
 #include "gtkcolorchooserdialog.h"
 #include "gtkcolorswatchprivate.h"
+#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkdragsource.h"
 #include "gtkintl.h"
@@ -44,9 +45,6 @@
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontext.h"
-#include "gtkdragsource.h"
-#include "gtkdragdest.h"
-#include "gtkeventcontroller.h"
 
 
 /**
@@ -123,6 +121,21 @@ static void gtk_color_button_get_property  (GObject          *object,
 static void gtk_color_button_clicked       (GtkButton        *button,
                                             gpointer          user_data);
 
+/* source side drag signals */
+static void gtk_color_button_drag_begin    (GtkWidget        *widget,
+                                            GdkDrag          *drag,
+                                            gpointer          data);
+static void gtk_color_button_drag_data_get (GtkWidget        *widget,
+                                            GdkDrag          *drag,
+                                            GtkSelectionData *selection_data,
+                                            GtkColorButton   *button);
+
+/* target side drag signals */
+static void gtk_color_button_drag_data_received (GtkWidget        *widget,
+                                                 GdkDrop          *drop,
+                                                 GtkSelectionData *selection_data,
+                                                 GtkColorButton   *button);
+
 
 static guint color_button_signals[LAST_SIGNAL] = { 0 };
 
@@ -229,68 +242,94 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
                                                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_css_name (widget_class, "colorbutton");
 }
 
 static void
-got_color (GObject      *source,
-           GAsyncResult *result,
-           gpointer      data)
-{
-  GdkDrop *drop = GDK_DROP (source);
-  const GValue *value;
-
-  value = gdk_drop_read_value_finish (drop, result, NULL);
-  if (value)
-    {
-      GdkRGBA *color = g_value_get_boxed (value);
-      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (data), color);
-      gdk_drop_finish (drop, GDK_ACTION_COPY);
-    }
-  else
-    gdk_drop_finish (drop, 0);
-}
-
-static gboolean
-gtk_color_button_drag_drop (GtkDropTarget  *dest,
-                            GdkDrop        *drop,
-                            int             x,
-                            int             y,
-                            GtkColorButton *button)
-{
-  if (gdk_drop_has_value (drop, GDK_TYPE_RGBA))
-    {
-      gdk_drop_read_value_async (drop, GDK_TYPE_RGBA, G_PRIORITY_DEFAULT, NULL, got_color, button);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-gtk_color_button_drag_begin (GtkDragSource  *source,
-                             GdkDrag        *drag,
-                             GtkColorButton *button)
+gtk_color_button_drag_data_received (GtkWidget        *widget,
+                                     GdkDrop          *drop,
+                                     GtkSelectionData *selection_data,
+                                     GtkColorButton   *button)
 {
   GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);
+  gint length;
+  guint16 *dropped;
+
+  length = gtk_selection_data_get_length (selection_data);
+
+  if (length < 0)
+    return;
+
+  /* We accept drops with the wrong format, since the KDE color
+   * chooser incorrectly drops application/x-color with format 8.
+   */
+  if (length != 8)
+    {
+      g_warning ("%s: Received invalid color data", G_STRFUNC);
+      return;
+    }
+
+
+  dropped = (guint16 *) gtk_selection_data_get_data (selection_data);
+
+  priv->rgba.red = dropped[0] / 65535.;
+  priv->rgba.green = dropped[1] / 65535.;
+  priv->rgba.blue = dropped[2] / 65535.;
+  priv->rgba.alpha = dropped[3] / 65535.;
+
+  gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (priv->swatch), &priv->rgba);
+
+  g_signal_emit (button, color_button_signals[COLOR_SET], 0);
+
+  g_object_freeze_notify (G_OBJECT (button));
+  g_object_notify (G_OBJECT (button), "rgba");
+  g_object_thaw_notify (G_OBJECT (button));
+}
+
+static void
+set_color_icon (GdkDrag        *drag,
+                const GdkRGBA  *rgba)
+{
   GtkSnapshot *snapshot;
   GdkPaintable *paintable;
 
   snapshot = gtk_snapshot_new ();
-  gtk_snapshot_append_color (snapshot, &priv->rgba, &GRAPHENE_RECT_INIT(0, 0, 48, 32));
+  gtk_snapshot_append_color (snapshot,
+                             rgba,
+                             &GRAPHENE_RECT_INIT(0, 0, 48, 32));
   paintable = gtk_snapshot_free_to_paintable (snapshot, NULL);
 
-  gtk_drag_source_set_icon (source, paintable, 0, 0);
-
+  gtk_drag_set_icon_paintable (drag, paintable, 0, 0);
   g_object_unref (paintable);
 }
 
 static void
-get_rgba_value (GValue   *value,
-                gpointer  data)
+gtk_color_button_drag_begin (GtkWidget      *widget,
+                             GdkDrag        *drag,
+                             gpointer        data)
 {
-  GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (GTK_COLOR_BUTTON (data));
-  g_value_set_boxed (value, &priv->rgba);
+  GtkColorButton *button = data;
+  GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);
+
+  set_color_icon (drag, &priv->rgba);
+}
+
+static void
+gtk_color_button_drag_data_get (GtkWidget        *widget,
+                                GdkDrag          *drag,
+                                GtkSelectionData *selection_data,
+                                GtkColorButton   *button)
+{
+  GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);
+  guint16 dropped[4];
+
+  dropped[0] = (guint16) (priv->rgba.red * 65535);
+  dropped[1] = (guint16) (priv->rgba.green * 65535);
+  dropped[2] = (guint16) (priv->rgba.blue * 65535);
+  dropped[3] = (guint16) (priv->rgba.alpha * 65535);
+
+  gtk_selection_data_set (selection_data,
+                          gtk_selection_data_get_target (selection_data),
+                          16, (guchar *)dropped, 8);
 }
 
 static void
@@ -301,9 +340,6 @@ gtk_color_button_init (GtkColorButton *button)
   PangoRectangle rect;
   GtkStyleContext *context;
   GdkContentFormats *targets;
-  GdkContentProvider *content;
-  GtkDragSource *source;
-  GtkDropTarget *dest;
 
   priv->button = gtk_button_new ();
   g_signal_connect (priv->button, "clicked", G_CALLBACK (gtk_color_button_clicked), button);
@@ -328,17 +364,23 @@ gtk_color_button_init (GtkColorButton *button)
   priv->use_alpha = FALSE;
 
   targets = gdk_content_formats_new (drop_types, G_N_ELEMENTS (drop_types));
-  dest = gtk_drop_target_new (targets, GDK_ACTION_COPY);
-  g_signal_connect (dest, "drag-drop", G_CALLBACK (gtk_color_button_drag_drop), button);
-  gtk_widget_add_controller (GTK_WIDGET (button), GTK_EVENT_CONTROLLER (dest));
+  gtk_drag_dest_set (priv->button,
+                     GTK_DEST_DEFAULT_MOTION |
+                     GTK_DEST_DEFAULT_HIGHLIGHT |
+                     GTK_DEST_DEFAULT_DROP,
+                     targets,
+                     GDK_ACTION_COPY);
+  gtk_drag_source_set (priv->button,
+                       GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
+                       targets,
+                       GDK_ACTION_COPY);
   gdk_content_formats_unref (targets);
-
-  source = gtk_drag_source_new ();
-  content = gdk_content_provider_new_with_callback (GDK_TYPE_RGBA, get_rgba_value, button);
-  gtk_drag_source_set_content (source, content);
-  g_object_unref (content);
-  g_signal_connect (source, "drag-begin", G_CALLBACK (gtk_color_button_drag_begin), button);
-  gtk_widget_add_controller (priv->button, GTK_EVENT_CONTROLLER (source));
+  g_signal_connect (priv->button, "drag-begin",
+                    G_CALLBACK (gtk_color_button_drag_begin), button);
+  g_signal_connect (priv->button, "drag-data-received",
+                    G_CALLBACK (gtk_color_button_drag_data_received), button);
+  g_signal_connect (priv->button, "drag-data-get",
+                    G_CALLBACK (gtk_color_button_drag_data_get), button);
 
   context = gtk_widget_get_style_context (GTK_WIDGET (priv->button));
   gtk_style_context_add_class (context, "color");

gtk/gtkcolorswatch.c

@@ -22,6 +22,7 @@
 #include "gtkbox.h"
 #include "gtkcolorchooserprivate.h"
 #include "gtkcssnodeprivate.h"
+#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkdragsource.h"
 #include "gtkgesturelongpress.h"
@@ -39,7 +40,6 @@
 #include "gtkwidgetprivate.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtknative.h"
-#include "gtkdragsource.h"
 
 #include "a11y/gtkcolorswatchaccessibleprivate.h"
 
@@ -66,7 +66,6 @@ typedef struct
   GtkWidget *overlay_widget;
 
   GtkWidget *popover;
-  GtkDropTarget *dest;
 } GtkColorSwatchPrivate;
 
 enum
@@ -74,8 +73,7 @@ enum
   PROP_ZERO,
   PROP_RGBA,
   PROP_SELECTABLE,
-  PROP_HAS_MENU,
-  PROP_CAN_DROP
+  PROP_HAS_MENU
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkColorSwatch, gtk_color_swatch, GTK_TYPE_WIDGET)
@@ -115,57 +113,87 @@ swatch_snapshot (GtkWidget   *widget,
   gtk_widget_snapshot_child (widget, priv->overlay_widget, snapshot);
 }
 
+
 static void
-gtk_color_swatch_drag_begin (GtkDragSource  *source,
-                             GdkDrag        *drag,
-                             GtkColorSwatch *swatch)
+drag_set_color_icon (GdkDrag        *drag,
+                     const GdkRGBA  *color)
 {
-  GtkColorSwatchPrivate *priv = gtk_color_swatch_get_instance_private (swatch);
   GtkSnapshot *snapshot;
   GdkPaintable *paintable;
 
   snapshot = gtk_snapshot_new ();
-  gtk_snapshot_append_color (snapshot, &priv->color, &GRAPHENE_RECT_INIT(0, 0, 48, 32));
+  gtk_snapshot_append_color (snapshot,
+                             color,
+                             &GRAPHENE_RECT_INIT(0, 0, 48, 32));
   paintable = gtk_snapshot_free_to_paintable (snapshot, NULL);
 
-  gtk_drag_source_set_icon (source, paintable, 0, 0);
-
+  gtk_drag_set_icon_paintable (drag, paintable, 4, 4);
   g_object_unref (paintable);
 }
 
 static void
-got_color (GObject      *source,
-           GAsyncResult *result,
-           gpointer      data)
+swatch_drag_begin (GtkWidget      *widget,
+                   GdkDrag        *drag)
 {
-  GdkDrop *drop = GDK_DROP (source);
-  const GValue *value;
+  GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
+  GdkRGBA color;
 
-  value = gdk_drop_read_value_finish (drop, result, NULL);
-  if (value)
-    {
-      GdkRGBA *color = g_value_get_boxed (value);
-      gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (data), color);
-      gdk_drop_finish (drop, GDK_ACTION_COPY);
-    }
-  else
-    gdk_drop_finish (drop, 0);
+  gtk_color_swatch_get_rgba (swatch, &color);
+  drag_set_color_icon (drag, &color);
 }
 
-static gboolean
-swatch_drag_drop (GtkDropTarget  *dest,
-                  GdkDrop        *drop,
-                  int             x,
-                  int             y,
-                  GtkColorSwatch *swatch)
+static void
+swatch_drag_data_get (GtkWidget        *widget,
+                      GdkDrag          *drag,
+                      GtkSelectionData *selection_data)
 {
-  if (gdk_drop_has_value (drop, GDK_TYPE_RGBA))
+  GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
+  guint16 vals[4];
+  GdkRGBA color;
+
+  gtk_color_swatch_get_rgba (swatch, &color);
+
+  vals[0] = color.red * 0xffff;
+  vals[1] = color.green * 0xffff;
+  vals[2] = color.blue * 0xffff;
+  vals[3] = color.alpha * 0xffff;
+
+  gtk_selection_data_set (selection_data,
+                          g_intern_static_string ("application/x-color"),
+                          16, (guchar *)vals, 8);
+}
+
+static void
+swatch_drag_data_received (GtkWidget        *widget,
+                           GdkDrop          *drop,
+                           GtkSelectionData *selection_data)
+{
+  gint length;
+  guint16 *vals;
+  GdkRGBA color;
+
+  length = gtk_selection_data_get_length (selection_data);
+
+  if (length < 0)
+    return;
+
+  /* We accept drops with the wrong format, since the KDE color
+   * chooser incorrectly drops application/x-color with format 8.
+   */
+  if (length != 8)
     {
-      gdk_drop_read_value_async (drop, GDK_TYPE_RGBA, G_PRIORITY_DEFAULT, NULL, got_color, swatch);
-      return TRUE;
+      g_warning ("Received invalid color data");
+      return;
     }
 
-  return FALSE;
+  vals = (guint16 *) gtk_selection_data_get_data (selection_data);
+
+  color.red   = (gdouble)vals[0] / 0xffff;
+  color.green = (gdouble)vals[1] / 0xffff;
+  color.blue  = (gdouble)vals[2] / 0xffff;
+  color.alpha = (gdouble)vals[3] / 0xffff;
+
+  gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (widget), &color);
 }
 
 static void
@@ -427,9 +455,6 @@ swatch_get_property (GObject    *object,
     case PROP_HAS_MENU:
       g_value_set_boolean (value, priv->has_menu);
       break;
-    case PROP_CAN_DROP:
-      g_value_set_boolean (value, priv->dest != NULL);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -456,9 +481,6 @@ swatch_set_property (GObject      *object,
     case PROP_HAS_MENU:
       priv->has_menu = g_value_get_boolean (value);
       break;
-    case PROP_CAN_DROP:
-      gtk_color_swatch_set_can_drop (swatch, g_value_get_boolean (value));
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -473,7 +495,7 @@ swatch_finalize (GObject *object)
 
   g_free (priv->icon);
   gtk_widget_unparent (priv->overlay_widget);
- 
+
   G_OBJECT_CLASS (gtk_color_swatch_parent_class)->finalize (object);
 }
 
@@ -501,6 +523,9 @@ gtk_color_swatch_class_init (GtkColorSwatchClass *class)
 
   widget_class->measure = gtk_color_swatch_measure;
   widget_class->snapshot = swatch_snapshot;
+  widget_class->drag_begin = swatch_drag_begin;
+  widget_class->drag_data_get = swatch_drag_data_get;
+  widget_class->drag_data_received = swatch_drag_data_received;
   widget_class->popup_menu = swatch_popup_menu;
   widget_class->size_allocate = swatch_size_allocate;
   widget_class->state_flags_changed = swatch_state_flags_changed;
@@ -514,9 +539,6 @@ gtk_color_swatch_class_init (GtkColorSwatchClass *class)
   g_object_class_install_property (object_class, PROP_HAS_MENU,
       g_param_spec_boolean ("has-menu", P_("Has Menu"), P_("Whether the swatch should offer customization"),
                             TRUE, GTK_PARAM_READWRITE));
-  g_object_class_install_property (object_class, PROP_CAN_DROP,
-      g_param_spec_boolean ("can-drop", P_("Can Drop"), P_("Whether the swatch should accept drops"),
-                            FALSE, GTK_PARAM_READWRITE));
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_COLOR_SWATCH_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, I_("colorswatch"));
@@ -578,14 +600,6 @@ static const char *dnd_targets[] = {
   "application/x-color"
 };
 
-static void
-get_rgba_value (GValue   *value,
-                gpointer  data)
-{
-  GtkColorSwatchPrivate *priv = gtk_color_swatch_get_instance_private (GTK_COLOR_SWATCH (data));
-  g_value_set_boxed (value, &priv->color);
-}
-
 void
 gtk_color_swatch_set_rgba (GtkColorSwatch *swatch,
                            const GdkRGBA  *color)
@@ -597,16 +611,12 @@ gtk_color_swatch_set_rgba (GtkColorSwatch *swatch,
 
   if (!priv->has_color)
     {
-      GdkContentProvider *content;
-      GtkDragSource *source;
-
-      source = gtk_drag_source_new ();
-      content = gdk_content_provider_new_with_callback (GDK_TYPE_RGBA, get_rgba_value, swatch);
-      gtk_drag_source_set_content (source, content);
-      g_object_unref (content);
-      g_signal_connect (source, "drag-begin", G_CALLBACK (gtk_color_swatch_drag_begin), swatch);
-
-      gtk_widget_add_controller (GTK_WIDGET (swatch), GTK_EVENT_CONTROLLER (source));
+      GdkContentFormats *targets = gdk_content_formats_new (dnd_targets, G_N_ELEMENTS (dnd_targets));
+      gtk_drag_source_set (GTK_WIDGET (swatch),
+                           GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
+                           targets,
+                           GDK_ACTION_COPY | GDK_ACTION_MOVE);
+      gdk_content_formats_unref (targets);
     }
 
   priv->has_color = TRUE;
@@ -666,28 +676,21 @@ void
 gtk_color_swatch_set_can_drop (GtkColorSwatch *swatch,
                                gboolean        can_drop)
 {
-  GtkColorSwatchPrivate *priv = gtk_color_swatch_get_instance_private (swatch);
-
-  if (can_drop == (priv->dest != NULL))
-    return;
-
-  if (can_drop && !priv->dest)
+  if (can_drop)
     {
-      GdkContentFormats *targets;
-
-      targets = gdk_content_formats_new (dnd_targets, G_N_ELEMENTS (dnd_targets));
-      priv->dest = gtk_drop_target_new (targets, GDK_ACTION_COPY);
-      g_signal_connect (priv->dest, "drag-drop", G_CALLBACK (swatch_drag_drop), swatch);
-      gtk_widget_add_controller (GTK_WIDGET (swatch), GTK_EVENT_CONTROLLER (priv->dest));
+      GdkContentFormats *targets = gdk_content_formats_new (dnd_targets, G_N_ELEMENTS (dnd_targets));
+      gtk_drag_dest_set (GTK_WIDGET (swatch),
+                         GTK_DEST_DEFAULT_HIGHLIGHT |
+                         GTK_DEST_DEFAULT_MOTION |
+                         GTK_DEST_DEFAULT_DROP,
+                         targets,
+                         GDK_ACTION_COPY);
       gdk_content_formats_unref (targets);
     }
-  if (!can_drop && priv->dest)
+  else
     {
-      gtk_widget_remove_controller (GTK_WIDGET (swatch), GTK_EVENT_CONTROLLER (priv->dest));
-      priv->dest = NULL;
+      gtk_drag_dest_unset (GTK_WIDGET (swatch));
     }
-
-  g_object_notify (G_OBJECT (swatch), "can-drop");
 }
 
 void

gtk/gtkcontainer.c

@@ -115,6 +115,9 @@ static void     gtk_container_children_callback    (GtkWidget         *widget,
                                                     gpointer           client_data);
 static GtkSizeRequestMode gtk_container_get_request_mode (GtkWidget   *widget);
 
+static GtkWidgetPath * gtk_container_real_get_path_for_child (GtkContainer *container,
+                                                              GtkWidget    *child);
+
 /* GtkBuildable */
 static void gtk_container_buildable_init           (GtkBuildableIface *iface);
 static GtkBuildableIface    *parent_buildable_iface;
@@ -146,6 +149,7 @@ gtk_container_class_init (GtkContainerClass *class)
   class->forall = NULL;
   class->set_focus_child = gtk_container_real_set_focus_child;
   class->child_type = NULL;
+  class->get_path_for_child = gtk_container_real_get_path_for_child;
 
   container_signals[ADD] =
     g_signal_new (I_("add"),
@@ -371,7 +375,9 @@ gtk_container_idle_sizer (GdkFrameClock *clock,
    */
   if (gtk_widget_needs_allocate (GTK_WIDGET (container)))
     {
-      if (GTK_IS_ROOT (container))
+      if (GTK_IS_WINDOW (container))
+        gtk_window_check_resize (GTK_WINDOW (container));
+      else if (GTK_IS_ROOT (container))
         gtk_native_check_resize (GTK_NATIVE (container));
       else
         g_warning ("gtk_container_idle_sizer() called on a non-native non-window");
@@ -474,8 +480,8 @@ gtk_container_get_request_mode (GtkWidget *widget)
 /**
  * gtk_container_forall: (virtual forall)
  * @container: a #GtkContainer
- * @callback: (scope call): a callback
- * @callback_data: (closure): callback user data
+ * @callback: (scope call) (closure callback_data): a callback
+ * @callback_data: callback user data
  *
  * Invokes @callback on each direct child of @container, including
  * children that are considered “internal” (implementation details
@@ -645,6 +651,18 @@ gtk_container_real_set_focus_child (GtkContainer *container,
     }
 }
 
+static GtkWidgetPath *
+gtk_container_real_get_path_for_child (GtkContainer *container,
+                                       GtkWidget    *child)
+{
+  GtkWidgetPath *path;
+
+  path = _gtk_widget_create_path (GTK_WIDGET (container));
+  gtk_widget_path_append_for_widget (path, child);
+
+  return path;
+}
+
 static void
 gtk_container_children_callback (GtkWidget *widget,
                                  gpointer   client_data)
@@ -765,3 +783,35 @@ gtk_container_get_focus_hadjustment (GtkContainer *container)
   return hadjustment;
 }
 
+/**
+ * gtk_container_get_path_for_child:
+ * @container: a #GtkContainer
+ * @child: a child of @container
+ *
+ * Returns a newly created widget path representing all the widget hierarchy
+ * from the toplevel down to and including @child.
+ *
+ * Returns: A newly created #GtkWidgetPath
+ **/
+GtkWidgetPath *
+gtk_container_get_path_for_child (GtkContainer *container,
+                                  GtkWidget    *child)
+{
+  GtkWidgetPath *path;
+
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
+  g_return_val_if_fail (container == (GtkContainer *) _gtk_widget_get_parent (child), NULL);
+
+  path = GTK_CONTAINER_GET_CLASS (container)->get_path_for_child (container, child);
+  if (gtk_widget_path_get_object_type (path) != G_OBJECT_TYPE (child))
+    {
+      g_critical ("%s %p returned a widget path for type %s, but child is %s",
+                  G_OBJECT_TYPE_NAME (container),
+                  container,
+                  g_type_name (gtk_widget_path_get_object_type (path)),
+                  G_OBJECT_TYPE_NAME (child));
+    }
+
+  return path;
+}

gtk/gtkcontainer.h

@@ -62,6 +62,8 @@ struct _GtkContainer
  * @child_type: Returns the type of the children supported by the container.
  * @set_child_property: Set a property on a child of container.
  * @get_child_property: Get a property from a child of container.
+ * @get_path_for_child: Get path representing entire widget hierarchy
+ *    from the toplevel down to and including @child.
  *
  * Base class for containers.
  */
@@ -81,6 +83,8 @@ struct _GtkContainerClass
   void    (*set_focus_child)	(GtkContainer	 *container,
 				 GtkWidget	 *child);
   GType   (*child_type)		(GtkContainer	 *container);
+  GtkWidgetPath * (*get_path_for_child) (GtkContainer *container,
+                                         GtkWidget    *child);
 
 
   /*< private >*/
@@ -128,6 +132,10 @@ void    gtk_container_forall		     (GtkContainer *container,
 					      GtkCallback   callback,
 					      gpointer	    callback_data);
 
+GDK_AVAILABLE_IN_ALL
+GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
+                                                  GtkWidget         *child);
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkContainer, g_object_unref)
 
 G_END_DECLS

gtk/gtkcssanimatedstyle.c

@@ -79,15 +79,6 @@ gtk_css_animated_style_is_static (GtkCssStyle *style)
   return TRUE;
 }
 
-static GtkCssStaticStyle *
-gtk_css_animated_style_get_static_style (GtkCssStyle *style)
-{
-  /* This is called a lot, so we avoid a dynamic type check here */
-  GtkCssAnimatedStyle *animated = (GtkCssAnimatedStyle *) style;
-
-  return (GtkCssStaticStyle *)animated->style;
-}
-
 static void
 gtk_css_animated_style_dispose (GObject *object)
 {
@@ -132,7 +123,6 @@ gtk_css_animated_style_class_init (GtkCssAnimatedStyleClass *klass)
   style_class->get_value = gtk_css_animated_style_get_value;
   style_class->get_section = gtk_css_animated_style_get_section;
   style_class->is_static = gtk_css_animated_style_is_static;
-  style_class->get_static_style = gtk_css_animated_style_get_static_style;
 }
 
 static void

gtk/gtkcssarrayvalue.c

@@ -299,7 +299,7 @@ gtk_css_value_array_transition (GtkCssValue *start,
 }
 
 static gboolean
-gtk_css_value_array_is_dynamic (const GtkCssValue *value)
+gtk_css_value_array_is_dynamic (GtkCssValue *value)
 {
   guint i;
 
@@ -392,28 +392,30 @@ _gtk_css_array_value_new_from_array (GtkCssValue **values,
                                      guint         n_values)
 {
   GtkCssValue *result;
-  guint i;
-
+  gboolean is_static;
+  int i;
+           
   g_return_val_if_fail (values != NULL, NULL);
   g_return_val_if_fail (n_values > 0, NULL);
 
   if (n_values == 1)
     return values[0];
 
-  result = _gtk_css_value_alloc (&GTK_CSS_VALUE_ARRAY, sizeof (GtkCssValue) + sizeof (GtkCssValue *) * (n_values - 1));
-  result->n_values = n_values;
-  memcpy (&result->values[0], values, sizeof (GtkCssValue *) * n_values);
-
-  result->is_computed = TRUE;
-  for (i = 0; i < n_values; i ++)
+  is_static = TRUE;
+  for (i = 0; i < n_values; i++)
     {
-      if (!gtk_css_value_is_computed (values[i]))
+      if (!values[i]->is_static)
         {
-          result->is_computed = FALSE;
+          is_static = FALSE;
           break;
         }
-    }
+   }
 
+  result = _gtk_css_value_alloc (&GTK_CSS_VALUE_ARRAY, sizeof (GtkCssValue) + sizeof (GtkCssValue *) * (n_values - 1));
+  result->is_static = is_static;
+  result->n_values = n_values;
+  memcpy (&result->values[0], values, sizeof (GtkCssValue *) * n_values);
+            
   return result;
 }
 
@@ -422,28 +424,25 @@ _gtk_css_array_value_parse (GtkCssParser *parser,
                             GtkCssValue  *(* parse_func) (GtkCssParser *parser))
 {
   GtkCssValue *value, *result;
-  GtkCssValue *values[128];
-  guint n_values = 0;
-  guint i;
+  GPtrArray *values;
+
+  values = g_ptr_array_sized_new (2);
 
   do {
     value = parse_func (parser);
 
     if (value == NULL)
       {
-        for (i = 0; i < n_values; i ++)
-          _gtk_css_value_unref (values[i]);
-
+        g_ptr_array_set_free_func (values, (GDestroyNotify) _gtk_css_value_unref);
+        g_ptr_array_free (values, TRUE);
         return NULL;
       }
 
-    values[n_values] = value;
-    n_values ++;
-    if (G_UNLIKELY (n_values > G_N_ELEMENTS (values)))
-      g_error ("Only %d elements in a css array are allowed", (int)G_N_ELEMENTS (values));
+    g_ptr_array_add (values, value);
   } while (gtk_css_parser_try_token (parser, GTK_CSS_TOKEN_COMMA));
 
-  result = _gtk_css_array_value_new_from_array (values, n_values);
+  result = _gtk_css_array_value_new_from_array ((GtkCssValue **) values->pdata, values->len);
+  g_ptr_array_free (values, TRUE);
   return result;
 }
 

gtk/gtkcssarrayvalueprivate.h

@@ -34,7 +34,7 @@ GtkCssValue *       _gtk_css_array_value_parse          (GtkCssParser          *
 
 GtkCssValue *       _gtk_css_array_value_get_nth        (GtkCssValue           *value,
                                                          guint                  i);
-guint               _gtk_css_array_value_get_n_values   (const GtkCssValue     *value) G_GNUC_PURE;
+guint               _gtk_css_array_value_get_n_values   (const GtkCssValue     *value);
 
 
 G_END_DECLS

gtk/gtkcssbgsizevalue.c

@@ -163,9 +163,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_BG_SIZE = {
   gtk_css_value_bg_size_print
 };
 
-static GtkCssValue auto_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, TRUE, FALSE, FALSE, NULL, NULL };
-static GtkCssValue cover_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, TRUE, TRUE, FALSE, NULL, NULL };
-static GtkCssValue contain_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, TRUE, FALSE, TRUE, NULL, NULL };
+static GtkCssValue auto_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, 0, FALSE, FALSE, NULL, NULL };
+static GtkCssValue cover_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, 0, TRUE, FALSE, NULL, NULL };
+static GtkCssValue contain_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, 0, FALSE, TRUE, NULL, NULL };
 
 GtkCssValue *
 _gtk_css_bg_size_value_new (GtkCssValue *x,
@@ -179,8 +179,6 @@ _gtk_css_bg_size_value_new (GtkCssValue *x,
   result = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_BG_SIZE);
   result->x = x;
   result->y = y;
-  result->is_computed = (!x || gtk_css_value_is_computed (x)) &&
-                        (!y || gtk_css_value_is_computed (y));
 
   return result;
 }

gtk/gtkcssbordervalue.c

@@ -163,10 +163,6 @@ _gtk_css_border_value_new (GtkCssValue *top,
   result->values[GTK_CSS_RIGHT] = right;
   result->values[GTK_CSS_BOTTOM] = bottom;
   result->values[GTK_CSS_LEFT] = left;
-  result->is_computed = (top && gtk_css_value_is_computed (top)) &&
-                        (right && gtk_css_value_is_computed (right)) &&
-                        (bottom && gtk_css_value_is_computed (bottom)) &&
-                        (left && gtk_css_value_is_computed (left));
 
   return result;
 }
@@ -217,14 +213,6 @@ _gtk_css_border_value_parse (GtkCssParser           *parser,
         result->values[i] = _gtk_css_value_ref (result->values[(i - 1) >> 1]);
     }
 
-  result->is_computed = TRUE;
-  for (; i < 4; i++)
-    if (result->values[i] && !gtk_css_value_is_computed (result->values[i]))
-      {
-        result->is_computed = FALSE;
-        break;
-      }
-
   return result;
 }
 

gtk/gtkcssboxesimplprivate.h

@@ -23,7 +23,6 @@
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkcssnumbervalueprivate.h"
-#include "gtkcssdimensionvalueprivate.h"
 #include "gtkwidgetprivate.h"
 
 /* This file is included from gtkcssboxesprivate.h */
@@ -80,50 +79,15 @@ gtk_css_boxes_rect_grow (GskRoundedRect *dest,
                          int             bottom_property,
                          int             left_property)
 {
-  GtkCssValue *top = gtk_css_style_get_value (style, top_property);
-  GtkCssValue *right = gtk_css_style_get_value (style, right_property);
-  GtkCssValue *bottom = gtk_css_style_get_value (style, bottom_property);
-  GtkCssValue *left = gtk_css_style_get_value (style, left_property);
+  double top = _gtk_css_number_value_get (gtk_css_style_get_value (style, top_property), 100);
+  double right = _gtk_css_number_value_get (gtk_css_style_get_value (style, right_property), 100);
+  double bottom = _gtk_css_number_value_get (gtk_css_style_get_value (style, bottom_property), 100);
+  double left = _gtk_css_number_value_get (gtk_css_style_get_value (style, left_property), 100);
 
-  if (gtk_css_dimension_value_is_zero (left))
-    {
-      dest->bounds.origin.x = src->bounds.origin.x;
-      if (gtk_css_dimension_value_is_zero (right))
-        dest->bounds.size.width = src->bounds.size.width;
-      else
-        dest->bounds.size.width = src->bounds.size.width + _gtk_css_number_value_get (right, 100);
-    }
-  else
-    {
-      const double left_value = _gtk_css_number_value_get (left, 100);
-
-      dest->bounds.origin.x = src->bounds.origin.x - left_value;
-      if (gtk_css_dimension_value_is_zero (right))
-        dest->bounds.size.width = src->bounds.size.width + left_value;
-      else
-        dest->bounds.size.width = src->bounds.size.width + left_value + _gtk_css_number_value_get (right, 100);
-
-    }
-
-
-  if (gtk_css_dimension_value_is_zero (top))
-    {
-      dest->bounds.origin.y = src->bounds.origin.y;
-      if (gtk_css_dimension_value_is_zero (bottom))
-        dest->bounds.size.height = src->bounds.size.height;
-      else
-        dest->bounds.size.height = src->bounds.size.height + _gtk_css_number_value_get (bottom, 100);
-    }
-  else
-    {
-      const double top_value = _gtk_css_number_value_get (top, 100);
-
-      dest->bounds.origin.y = src->bounds.origin.y - top_value;
-      if (gtk_css_dimension_value_is_zero (bottom))
-        dest->bounds.size.height = src->bounds.size.height + top_value;
-      else
-        dest->bounds.size.height = src->bounds.size.height + top_value + _gtk_css_number_value_get (bottom, 100);
-    }
+  dest->bounds.origin.x = src->bounds.origin.x - left;
+  dest->bounds.origin.y = src->bounds.origin.y - top;
+  dest->bounds.size.width = src->bounds.size.width + left + right;
+  dest->bounds.size.height = src->bounds.size.height + top + bottom;
 }
 
 static inline void
@@ -359,38 +323,19 @@ gtk_css_boxes_apply_border_radius (GskRoundedRect    *box,
                                    const GtkCssValue *bottom_right,
                                    const GtkCssValue *bottom_left)
 {
-  gboolean has_border_radius = FALSE;
+  box->corner[GSK_CORNER_TOP_LEFT].width = _gtk_css_corner_value_get_x (top_left, box->bounds.size.width);
+  box->corner[GSK_CORNER_TOP_LEFT].height = _gtk_css_corner_value_get_y (top_left, box->bounds.size.height);
 
-  if (!gtk_css_corner_value_is_zero (top_left))
-    {
-      box->corner[GSK_CORNER_TOP_LEFT].width = _gtk_css_corner_value_get_x (top_left, box->bounds.size.width);
-      box->corner[GSK_CORNER_TOP_LEFT].height = _gtk_css_corner_value_get_y (top_left, box->bounds.size.height);
-      has_border_radius = TRUE;
-    }
+  box->corner[GSK_CORNER_TOP_RIGHT].width = _gtk_css_corner_value_get_x (top_right, box->bounds.size.width);
+  box->corner[GSK_CORNER_TOP_RIGHT].height = _gtk_css_corner_value_get_y (top_right, box->bounds.size.height);
 
-  if (!gtk_css_corner_value_is_zero (top_right))
-    {
-      box->corner[GSK_CORNER_TOP_RIGHT].width = _gtk_css_corner_value_get_x (top_right, box->bounds.size.width);
-      box->corner[GSK_CORNER_TOP_RIGHT].height = _gtk_css_corner_value_get_y (top_right, box->bounds.size.height);
-      has_border_radius = TRUE;
-    }
+  box->corner[GSK_CORNER_BOTTOM_RIGHT].width = _gtk_css_corner_value_get_x (bottom_right, box->bounds.size.width);
+  box->corner[GSK_CORNER_BOTTOM_RIGHT].height = _gtk_css_corner_value_get_y (bottom_right, box->bounds.size.height);
 
-  if (!gtk_css_corner_value_is_zero (bottom_right))
-    {
-      box->corner[GSK_CORNER_BOTTOM_RIGHT].width = _gtk_css_corner_value_get_x (bottom_right, box->bounds.size.width);
-      box->corner[GSK_CORNER_BOTTOM_RIGHT].height = _gtk_css_corner_value_get_y (bottom_right, box->bounds.size.height);
-      has_border_radius = TRUE;
-    }
+  box->corner[GSK_CORNER_BOTTOM_LEFT].width = _gtk_css_corner_value_get_x (bottom_left, box->bounds.size.width);
+  box->corner[GSK_CORNER_BOTTOM_LEFT].height = _gtk_css_corner_value_get_y (bottom_left, box->bounds.size.height);
 
-  if (!gtk_css_corner_value_is_zero (bottom_left))
-    {
-      box->corner[GSK_CORNER_BOTTOM_LEFT].width = _gtk_css_corner_value_get_x (bottom_left, box->bounds.size.width);
-      box->corner[GSK_CORNER_BOTTOM_LEFT].height = _gtk_css_corner_value_get_y (bottom_left, box->bounds.size.height);
-      has_border_radius = TRUE;
-    }
-
-  if (has_border_radius)
-    gtk_css_boxes_clamp_border_radius (box);
+  gtk_css_boxes_clamp_border_radius (box);
 }
 
 /* NB: width and height must be >= 0 */

gtk/gtkcsscalcvalue.c

@@ -211,8 +211,8 @@ gtk_css_value_calc_has_percent (const GtkCssValue *value)
 }
 
 static GtkCssValue *
-gtk_css_value_calc_multiply (GtkCssValue *value,
-                             double       factor)
+gtk_css_value_calc_multiply (const GtkCssValue *value,
+                             double             factor)
 {
   GtkCssValue *result;
   gsize i;

gtk/gtkcsscolorvalue.c

@@ -19,6 +19,7 @@
 
 #include "gtkcsscolorvalueprivate.h"
 
+#include "gtkcssrgbavalueprivate.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkhslaprivate.h"
 #include "gtkprivate.h"
@@ -317,32 +318,16 @@ apply_shade (const GdkRGBA *in,
   _gdk_rgba_init_from_hsla (out, &hsla);
 }
 
-static inline double
-transition (double start,
-            double end,
-             double progress)
-{
-  return start + (end - start) * progress;
-}
-
 static void
 apply_mix (const GdkRGBA *in1,
            const GdkRGBA *in2,
            GdkRGBA       *out,
            double         factor)
 {
-  out->alpha = CLAMP (transition (in1->alpha, in2->alpha, factor), 0, 1);
-
-  if (out->alpha <= 0.0)
-    {
-      out->red = out->green = out->blue = 0.0;
-    }
-  else
-    {
-      out->red   = CLAMP (transition (in1->red * in1->alpha, in2->red * in2->alpha, factor), 0,  1) / out->alpha;
-      out->green = CLAMP (transition (in1->green * in1->alpha, in2->green * in2->alpha, factor), 0,  1) / out->alpha;
-      out->blue  = CLAMP (transition (in1->blue * in1->alpha, in2->blue * in2->alpha, factor), 0,  1) / out->alpha;
-    }
+  out->red   = CLAMP (in1->red   + ((in2->red   - in1->red)   * factor), 0, 1);
+  out->green = CLAMP (in1->green + ((in2->green - in1->green) * factor), 0, 1);
+  out->blue  = CLAMP (in1->blue  + ((in2->blue  - in1->blue)  * factor), 0, 1);
+  out->alpha = CLAMP (in1->alpha + ((in2->alpha - in1->alpha) * factor), 0, 1);
 }
 
 GtkCssValue *
@@ -381,61 +366,59 @@ _gtk_css_color_value_resolve (GtkCssValue      *color,
       break;
     case COLOR_TYPE_SHADE:
       {
-        const GdkRGBA *c;
-        GtkCssValue *val;
-        GdkRGBA shade;
+	GtkCssValue *val;
+	GdkRGBA shade;
 
-        val = _gtk_css_color_value_resolve (color->sym_col.shade.color, provider, current, cycle_list);
-        if (val == NULL)
-          return NULL;
-        c = gtk_css_color_value_get_rgba (val);
+	val = _gtk_css_color_value_resolve (color->sym_col.shade.color, provider, current, cycle_list);
+	if (val == NULL)
+	  return NULL;
 
-        apply_shade (c, &shade, color->sym_col.shade.factor);
+        apply_shade (gtk_css_color_value_get_rgba (val), &shade, color->sym_col.shade.factor);
+
+	_gtk_css_value_unref (val);
 
         value = _gtk_css_color_value_new_literal (&shade);
-        _gtk_css_value_unref (val);
       }
 
       break;
     case COLOR_TYPE_ALPHA:
       {
-        const GdkRGBA *c;
-        GtkCssValue *val;
-        GdkRGBA alpha;
+	GtkCssValue *val;
+	GdkRGBA alpha;
 
-        val = _gtk_css_color_value_resolve (color->sym_col.alpha.color, provider, current, cycle_list);
-        if (val == NULL)
-          return NULL;
-        c = gtk_css_color_value_get_rgba (val);
+	val = _gtk_css_color_value_resolve (color->sym_col.alpha.color, provider, current, cycle_list);
+	if (val == NULL)
+	  return NULL;
 
-        apply_alpha (c, &alpha, color->sym_col.alpha.factor);
+	alpha = *gtk_css_color_value_get_rgba (val);
+        apply_alpha (&alpha, &alpha, color->sym_col.alpha.factor);
+
+	_gtk_css_value_unref (val);
 
         value = _gtk_css_color_value_new_literal (&alpha);
-        _gtk_css_value_unref (val);
       }
       break;
 
     case COLOR_TYPE_MIX:
       {
-        const GdkRGBA *color1, *color2;
-        GtkCssValue *val1, *val2;
-        GdkRGBA res;
+	GtkCssValue *val;
+	GdkRGBA color1, color2, res;
 
-        val1 = _gtk_css_color_value_resolve (color->sym_col.mix.color1, provider, current, cycle_list);
-        if (val1 == NULL)
-          return NULL;
-        color1 = gtk_css_color_value_get_rgba (val1);
+	val = _gtk_css_color_value_resolve (color->sym_col.mix.color1, provider, current, cycle_list);
+	if (val == NULL)
+	  return NULL;
+	color1 = *gtk_css_color_value_get_rgba (val);
+	_gtk_css_value_unref (val);
 
-        val2 = _gtk_css_color_value_resolve (color->sym_col.mix.color2, provider, current, cycle_list);
-        if (val2 == NULL)
-          return NULL;
-        color2 = gtk_css_color_value_get_rgba (val2);
+	val = _gtk_css_color_value_resolve (color->sym_col.mix.color2, provider, current, cycle_list);
+	if (val == NULL)
+	  return NULL;
+	color2 = *gtk_css_color_value_get_rgba (val);
+	_gtk_css_value_unref (val);
 
-        apply_mix (color1, color2, &res, color->sym_col.mix.factor);
+        apply_mix (&color1, &color2, &res, color->sym_col.mix.factor);
 
         value = _gtk_css_color_value_new_literal (&res);
-        _gtk_css_value_unref (val1);
-        _gtk_css_value_unref (val2);
       }
 
       break;
@@ -482,9 +465,9 @@ _gtk_css_color_value_resolve (GtkCssValue      *color,
   return value;
 }
 
-static GtkCssValue transparent_black_singleton = { &GTK_CSS_VALUE_COLOR, 1, TRUE, COLOR_TYPE_LITERAL, NULL,
+static GtkCssValue transparent_black_singleton = { &GTK_CSS_VALUE_COLOR, 1, 1, COLOR_TYPE_LITERAL, NULL,
                                                    .sym_col.rgba = {0, 0, 0, 0} };
-static GtkCssValue white_singleton             = { &GTK_CSS_VALUE_COLOR, 1, TRUE, COLOR_TYPE_LITERAL, NULL,
+static GtkCssValue white_singleton             = { &GTK_CSS_VALUE_COLOR, 1, 1, COLOR_TYPE_LITERAL, NULL,
                                                    .sym_col.rgba = {1, 1, 1, 1} };
 
 
@@ -507,15 +490,9 @@ _gtk_css_color_value_new_literal (const GdkRGBA *color)
 
   g_return_val_if_fail (color != NULL, NULL);
 
-  if (gdk_rgba_equal (color, &white_singleton.sym_col.rgba))
-    return _gtk_css_value_ref (&white_singleton);
-
-  if (gdk_rgba_equal (color, &transparent_black_singleton.sym_col.rgba))
-    return _gtk_css_value_ref (&transparent_black_singleton);
-
   value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
+  value->is_static = TRUE;
   value->type = COLOR_TYPE_LITERAL;
-  value->is_computed = TRUE;
   value->sym_col.rgba = *color;
 
   return value;
@@ -618,7 +595,7 @@ _gtk_css_color_value_new_mix (GtkCssValue *color1,
 GtkCssValue *
 _gtk_css_color_value_new_current_color (void)
 {
-  static GtkCssValue current_color = { &GTK_CSS_VALUE_COLOR, 1, FALSE, COLOR_TYPE_CURRENT_COLOR, NULL, };
+  static GtkCssValue current_color = { &GTK_CSS_VALUE_COLOR, 1, 0, COLOR_TYPE_CURRENT_COLOR, NULL, };
 
   return _gtk_css_value_ref (&current_color);
 }

gtk/gtkcsscolorvalueprivate.h

@@ -24,18 +24,18 @@
 G_BEGIN_DECLS
 
 
-GtkCssValue *   gtk_css_color_value_new_transparent     (void) G_GNUC_PURE;
-GtkCssValue *   gtk_css_color_value_new_white           (void) G_GNUC_PURE;
-GtkCssValue *   _gtk_css_color_value_new_literal        (const GdkRGBA  *color) G_GNUC_PURE;
-GtkCssValue *   _gtk_css_color_value_new_name           (const gchar    *name) G_GNUC_PURE;
+GtkCssValue *   gtk_css_color_value_new_transparent     (void);
+GtkCssValue *   gtk_css_color_value_new_white           (void);
+GtkCssValue *   _gtk_css_color_value_new_literal        (const GdkRGBA  *color);
+GtkCssValue *   _gtk_css_color_value_new_name           (const gchar    *name);
 GtkCssValue *   _gtk_css_color_value_new_shade          (GtkCssValue    *color,
-                                                         gdouble         factor) G_GNUC_PURE;
+                                                         gdouble         factor);
 GtkCssValue *   _gtk_css_color_value_new_alpha          (GtkCssValue    *color,
-                                                         gdouble         factor) G_GNUC_PURE;
+                                                         gdouble         factor);
 GtkCssValue *   _gtk_css_color_value_new_mix            (GtkCssValue    *color1,
                                                          GtkCssValue    *color2,
-                                                         gdouble         factor) G_GNUC_PURE;
-GtkCssValue *   _gtk_css_color_value_new_current_color  (void) G_GNUC_PURE;
+                                                         gdouble         factor);
+GtkCssValue *   _gtk_css_color_value_new_current_color  (void);
 
 gboolean        gtk_css_color_value_can_parse           (GtkCssParser   *parser);
 GtkCssValue *   _gtk_css_color_value_parse              (GtkCssParser   *parser);
@@ -44,7 +44,7 @@ GtkCssValue *   _gtk_css_color_value_resolve            (GtkCssValue      *color
                                                          GtkStyleProvider *provider,
                                                          GtkCssValue      *current,
                                                          GSList           *cycle_list);
-const GdkRGBA * gtk_css_color_value_get_rgba            (const GtkCssValue *color) G_GNUC_CONST;
+const GdkRGBA * gtk_css_color_value_get_rgba            (const GtkCssValue *color);
 
 
 G_END_DECLS

gtk/gtkcsscornervalue.c

@@ -18,8 +18,8 @@
 #include "config.h"
 
 #include "gtkcsscornervalueprivate.h"
+
 #include "gtkcssnumbervalueprivate.h"
-#include "gtkcssdimensionvalueprivate.h"
 
 struct _GtkCssValue {
   GTK_CSS_VALUE_BASE
@@ -115,10 +115,10 @@ _gtk_css_corner_value_new (GtkCssValue *x,
 {
   GtkCssValue *result;
 
-  if (_gtk_css_value_equal (x, y))
+  if (x == y)
     {
       _gtk_css_value_unref (y);
-      return x;
+      return _gtk_css_value_ref (x);
     }
 
   result = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_CORNER);
@@ -184,12 +184,3 @@ _gtk_css_corner_value_get_y (const GtkCssValue *corner,
   return _gtk_css_number_value_get (corner->y, one_hundred_percent);
 }
 
-gboolean
-gtk_css_corner_value_is_zero (const GtkCssValue *corner)
-{
-  if (corner->class != &GTK_CSS_VALUE_CORNER)
-    return gtk_css_dimension_value_is_zero (corner);
-
-  return gtk_css_dimension_value_is_zero (corner->x) &&
-         gtk_css_dimension_value_is_zero (corner->y);
-}

gtk/gtkcsscornervalueprivate.h

@@ -30,10 +30,9 @@ GtkCssValue *   _gtk_css_corner_value_new           (GtkCssValue            *x,
 GtkCssValue *   _gtk_css_corner_value_parse         (GtkCssParser           *parser);
 
 double          _gtk_css_corner_value_get_x         (const GtkCssValue      *corner,
-                                                     double                  one_hundred_percent) G_GNUC_PURE;
+                                                     double                  one_hundred_percent);
 double          _gtk_css_corner_value_get_y         (const GtkCssValue      *corner,
-                                                     double                  one_hundred_percent) G_GNUC_PURE;
-gboolean        gtk_css_corner_value_is_zero        (const GtkCssValue      *corner) G_GNUC_PURE;
+                                                     double                  one_hundred_percent);
 
 
 G_END_DECLS

gtk/gtkcssdimensionvalue.c

@@ -66,6 +66,40 @@ gtk_css_value_dimension_compute (GtkCssValue      *number,
                                  GtkCssStyle      *style,
                                  GtkCssStyle      *parent_style)
 {
+  GtkBorderStyle border_style;
+
+  /* special case according to http://dev.w3.org/csswg/css-backgrounds/#the-border-width */
+  switch (property_id)
+    {
+      case GTK_CSS_PROPERTY_BORDER_TOP_WIDTH:
+        border_style = _gtk_css_border_style_value_get(gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
+        if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN)
+          return gtk_css_dimension_value_new (0, GTK_CSS_NUMBER);
+        break;
+      case GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH:
+        border_style = _gtk_css_border_style_value_get(gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE));
+        if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN)
+          return gtk_css_dimension_value_new (0, GTK_CSS_NUMBER);
+        break;
+      case GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH:
+        border_style = _gtk_css_border_style_value_get(gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE));
+        if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN)
+          return gtk_css_dimension_value_new (0, GTK_CSS_NUMBER);
+        break;
+      case GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH:
+        border_style = _gtk_css_border_style_value_get(gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BORDER_LEFT_STYLE));
+        if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN)
+          return gtk_css_dimension_value_new (0, GTK_CSS_NUMBER);
+        break;
+      case GTK_CSS_PROPERTY_OUTLINE_WIDTH:
+        border_style = _gtk_css_border_style_value_get(gtk_css_style_get_value (style, GTK_CSS_PROPERTY_OUTLINE_STYLE));
+        if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN)
+          return gtk_css_dimension_value_new (0, GTK_CSS_NUMBER);
+        break;
+      default:
+        break;
+    }
+
   switch (number->unit)
     {
     default:
@@ -194,8 +228,8 @@ gtk_css_value_dimension_has_percent (const GtkCssValue *value)
 }
 
 static GtkCssValue *
-gtk_css_value_dimension_multiply (GtkCssValue *value,
-                                  double       factor)
+gtk_css_value_dimension_multiply (const GtkCssValue *value,
+                                  double             factor)
 {
   return gtk_css_dimension_value_new (value->value * factor, value->unit);
 }
@@ -243,25 +277,13 @@ gtk_css_value_dimension_get_calc_term_order (const GtkCssValue *value)
   return 1000 + order_per_unit[value->unit];
 }
 
-static GtkCssValue *
-gtk_css_value_dimension_transition (GtkCssValue *start,
-                                    GtkCssValue *end,
-                                    guint        property_id,
-                                    double       progress)
-{
-  if (start->unit != end->unit)
-    return NULL;
-
-  return gtk_css_dimension_value_new (start->value + (end->value - start->value) * progress, start->unit);
-}
-
 static const GtkCssNumberValueClass GTK_CSS_VALUE_DIMENSION = {
   {
     "GtkCssDimensionValue",
     gtk_css_value_dimension_free,
     gtk_css_value_dimension_compute,
     gtk_css_value_dimension_equal,
-    gtk_css_value_dimension_transition,
+    gtk_css_number_value_transition,
     NULL,
     NULL,
     gtk_css_value_dimension_print
@@ -279,37 +301,45 @@ gtk_css_dimension_value_new (double     value,
                              GtkCssUnit unit)
 {
   static GtkCssValue number_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_NUMBER, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_NUMBER, 1 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_NUMBER, 96 }, /* DPI default */
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_NUMBER, 0 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_NUMBER, 1 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_NUMBER, 96 }, /* DPI default */
   };
   static GtkCssValue px_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 1 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 2 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 3 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 4 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 8 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 16 }, /* Icon size default */
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 32 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PX, 64 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 0 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 1 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 2 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 3 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 4 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 5 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 6 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 7 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 8 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 16 }, /* Icon size default */
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 32 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 10 * 96.0 / 72.0 }, /* font size 10 */
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_PX, 11 * 96.0 / 72.0 }, /* font size 11 */
   };
   static GtkCssValue percent_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_PERCENT, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, FALSE, GTK_CSS_PERCENT, 50 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, FALSE, GTK_CSS_PERCENT, 100 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 0, GTK_CSS_PERCENT, 0 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 0, GTK_CSS_PERCENT, 50 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 0, GTK_CSS_PERCENT, 100 },
   };
   static GtkCssValue second_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_S, 0 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_S, 1 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_S, 0 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_S, 0.15 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_S, 0.2 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_S, 0.3 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_S, 1 },
   };
   static GtkCssValue deg_singletons[] = {
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 0   },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 90  },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 180 },
-    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, TRUE, GTK_CSS_DEG, 270 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_DEG, 0   },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_DEG, 90  },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_DEG, 180 },
+    { &GTK_CSS_VALUE_DIMENSION.value_class, 1, 1, GTK_CSS_DEG, 270 },
   };
   GtkCssValue *result;
+  gboolean is_static = FALSE;
 
   switch ((guint)unit)
     {
@@ -320,6 +350,7 @@ gtk_css_dimension_value_new (double     value,
       if (value == 96)
         return _gtk_css_value_ref (&number_singletons[2]);
 
+      is_static = TRUE;
       break;
 
     case GTK_CSS_PX:
@@ -327,17 +358,22 @@ gtk_css_dimension_value_new (double     value,
           value == 1 ||
           value == 2 ||
           value == 3 ||
-          value == 4)
+          value == 4 ||
+          value == 5 ||
+          value == 6 ||
+          value == 7 ||
+          value == 8)
         return _gtk_css_value_ref (&px_singletons[(int) value]);
-      if (value == 8)
-        return _gtk_css_value_ref (&px_singletons[5]);
       if (value == 16)
-        return _gtk_css_value_ref (&px_singletons[6]);
+        return _gtk_css_value_ref (&px_singletons[9]);
       if (value == 32)
-        return _gtk_css_value_ref (&px_singletons[7]);
-      if (value == 64)
-        return _gtk_css_value_ref (&px_singletons[8]);
+        return _gtk_css_value_ref (&px_singletons[10]);
+      if (value == 10 * 96.0 / 72.0)
+        return _gtk_css_value_ref (&px_singletons[11]);
+      if (value == 11 * 96.0 / 72.0)
+        return _gtk_css_value_ref (&px_singletons[12]);
 
+      is_static = TRUE;
       break;
 
     case GTK_CSS_PERCENT:
@@ -351,9 +387,18 @@ gtk_css_dimension_value_new (double     value,
       break;
 
     case GTK_CSS_S:
-      if (value == 0 || value == 1)
-        return _gtk_css_value_ref (&second_singletons[(int)value]);
+      if (value == 0)
+        return _gtk_css_value_ref (&second_singletons[0]);
+      if (value == 0.15)
+        return _gtk_css_value_ref (&second_singletons[1]);
+      if (value == 0.2)
+        return _gtk_css_value_ref (&second_singletons[2]);
+      if (value == 0.3)
+        return _gtk_css_value_ref (&second_singletons[3]);
+      if (value == 1)
+        return _gtk_css_value_ref (&second_singletons[4]);
 
+      is_static = TRUE;
       break;
 
     case GTK_CSS_DEG:
@@ -365,7 +410,32 @@ gtk_css_dimension_value_new (double     value,
         return _gtk_css_value_ref (&deg_singletons[2]);
       if (value == 270)
         return _gtk_css_value_ref (&deg_singletons[3]);
+   
+      is_static = TRUE;
+      break;
 
+    case GTK_CSS_RAD:
+      value = value * 360.0 / (2 * G_PI);
+      unit = GTK_CSS_DEG;
+      is_static = TRUE;
+      break;
+
+    case GTK_CSS_GRAD:
+      value = value * 360.0 / 400.0;
+      unit = GTK_CSS_DEG;
+      is_static = TRUE;
+      break;
+
+    case GTK_CSS_TURN:
+      value = value * 360.0;
+      unit = GTK_CSS_DEG;
+      is_static = TRUE;
+      break;
+
+    case GTK_CSS_MS:
+      value = value / 1000.0;
+      unit = GTK_CSS_S;
+      is_static = TRUE;
       break;
 
     default:
@@ -373,13 +443,9 @@ gtk_css_dimension_value_new (double     value,
     }
 
   result = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_DIMENSION.value_class);
+  result->is_static = is_static;
   result->unit = unit;
   result->value = value;
-  result->is_computed = value == 0 ||
-                        unit == GTK_CSS_NUMBER ||
-                        unit == GTK_CSS_PX ||
-                        unit == GTK_CSS_DEG ||
-                        unit == GTK_CSS_S;
 
   return result;
 }
@@ -492,19 +558,11 @@ gtk_css_dimension_value_parse (GtkCssParser           *parser,
     }
 
   result = gtk_css_dimension_value_new (number, unit);
+  if (flags & GTK_CSS_PARSE_NON_STATIC)
+    result->is_static = FALSE;
+
   gtk_css_parser_consume_token (parser);
 
   return result;
 }
 
-gboolean
-gtk_css_dimension_value_is_zero (const GtkCssValue *value)
-{
-  if (!value)
-    return TRUE;
-
-  if (value->class != &GTK_CSS_VALUE_DIMENSION.value_class)
-    return FALSE;
-
-  return value->value == 0;
-}