tests: Less linking

Build just a few binaries for the gsk tests,
avoiding the overhead of linking each one.

.gitlab-ci.yml

@@ -24,7 +24,7 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
   FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v40"
   FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
@@ -206,7 +206,7 @@ macos:
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
     - export MESON_FORCE_BACKTRACE=1
   script:
-    - meson setup ${COMMON_MESON_FLAGS}
+    - meson setup
             -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
@@ -215,10 +215,6 @@ macos:
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
-            -Ddemos=false
-            -Dbuild-tests=false
-            -Dbuild-examples=false
-            -Dbuild-testsuite=false
             _build
     - meson compile -C _build
   artifacts:
@@ -364,7 +360,6 @@ asan-build:
   tags: [ asan ]
   stage: analysis
   needs: []
-  when: manual
   variables:
   script:
     - export PATH="$HOME/.local/bin:$PATH"
@@ -392,10 +387,6 @@ reference:
             -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
             -Dpango:gtk_doc=true
-            -Ddemos=false
-            -Dbuild-examples=false
-            -Dbuild-tests=false
-            -Dbuild-testsuite=false
             _build
     - meson compile -C _build
     - mkdir -p _reference/

NEWS

@@ -1,73 +1,6 @@
-Overview of Changes in 4.9.3, 04-02-2023
+Overview of Changes in 4.9.3, xx-xx-xxxx
 ========================================
 
-* Add GtkUriLauncher, as replacement for gtk_show_uri
-
-* Add GdkMonitor::description
-
-* Fix problems with tooltip sizing
-
-* Deprecations:
- - GtkStatusbar
- - GtkAssistant
- - GtkLockButton
- - gtk_gesture_set_sequence_state
-
-* GtkColumnView:
- - Only create widgets for visible columns
-
-* GtkFileDialog:
- - Drop shortcut folders API
-
-* GtkCalendar:
- - Make marked days work again
-
-* GtkSwitch:
- - Make state and active independently settable
-
-* GtkFileChooser:
- - Fix a crash with DND
- - Fix excessively wide sidebar
- - Make context menus work again
-
-* Accessibility:
- - Make GtkAccessible public, so it can be implemented outside GTK
- - Support accessible implementation for editables
-
-* CSS:
- - Fix randomly stopping CSS animations
-
-* GL:
- - Fix synchronization with GStreamer
- - Fix problems with 3rd party GL in the same thread
-
-* Wayland:
- - Fix startup notification with xdg_activation
-
-* Broadway:
- - Implement modal windows
-
-* macOS:
- - Make DND work
-
-* Build:
- - Require graphene 1.10
- - Require gobject-introspection 1.72
-
-* Translation updates
- Catalan
- Galician
- German
- Hebrew
- Indonesian
- Portuguese
- Russian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
 Overview of Changes in 4.9.2, 26-12-2022
 ========================================
 

demos/gtk-demo/application.c

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 

demos/gtk-demo/assistant.c

@@ -7,8 +7,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *progress_bar = NULL;
 
 static gboolean

demos/gtk-demo/builder.c

@@ -37,8 +37,6 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static gboolean
 pop_status (gpointer data)
 {
@@ -59,8 +57,6 @@ status_message (GtkStatusbar *status,
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
-G_GNUC_END_IGNORE_DEPRECATIONS
-
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,

demos/gtk-demo/drawingarea.c

@@ -362,7 +362,7 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (scribble_resize), NULL);
 
       drag = gtk_gesture_drag_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), 0);
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
       gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
 
       g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);

demos/gtk-demo/pickers.c

@@ -1,11 +1,11 @@
-/* Pickers and Launchers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
+/* Pickers
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog
  *
- * The dialogs are mainly intended for use in preference dialogs.
+ * These widgets are mainly intended for use in preference dialogs.
  * They allow to select colors, fonts and applications.
  *
- * The launchers let you open files or URIs in applications that
- * can handle them.
+ * This demo shows both the default appearance for these dialogs,
+ * as well as some of the customizations that are possible.
  */
 
 #include <gtk/gtk.h>
@@ -73,9 +73,9 @@ open_file (GtkButton *picker,
 }
 
 static void
-open_app_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
+launch_done (GObject      *source,
+             GAsyncResult *result,
+             gpointer      data)
 {
   GtkFileLauncher *launcher = GTK_FILE_LAUNCHER (source);
   GError *error = NULL;
@@ -97,35 +97,7 @@ open_app (GtkButton *picker)
   file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
   launcher = gtk_file_launcher_new (file);
 
-  gtk_file_launcher_launch (launcher, parent, NULL, open_app_done, NULL);
-
-  g_object_unref (launcher);
-}
-
-static void
-open_uri_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GtkUriLauncher *launcher = GTK_URI_LAUNCHER (source);
-  GError *error = NULL;
-
-  if (!gtk_uri_launcher_launch_finish (launcher, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-launch_uri (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkUriLauncher *launcher;
-
-  launcher = gtk_uri_launcher_new ("http://www.gtk.org");
-
-  gtk_uri_launcher_launch (launcher, parent, NULL, open_uri_done, NULL);
+  gtk_file_launcher_launch (launcher, parent, NULL, launch_done, NULL);
 
   g_object_unref (launcher);
 }
@@ -141,7 +113,7 @@ do_pickers (GtkWidget *do_widget)
     window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Pickers and Launchers");
+    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
     table = gtk_grid_new ();
@@ -149,8 +121,8 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_margin_end (table, 20);
     gtk_widget_set_margin_top (table, 20);
     gtk_widget_set_margin_bottom (table, 20);
-    gtk_grid_set_row_spacing (GTK_GRID (table), 6);
-    gtk_grid_set_column_spacing (GTK_GRID (table), 6);
+    gtk_grid_set_row_spacing (GTK_GRID (table), 3);
+    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
     gtk_window_set_child (GTK_WINDOW (window), table);
 
     label = gtk_label_new ("Color:");
@@ -177,7 +149,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_hexpand (label, TRUE);
     gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
 
-    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
     button = gtk_button_new_from_icon_name ("document-open-symbolic");
     label = gtk_label_new ("None");
     gtk_label_set_xalign (GTK_LABEL (label), 0.);
@@ -186,23 +158,19 @@ do_pickers (GtkWidget *do_widget)
     g_signal_connect (button, "clicked", G_CALLBACK (open_file), label);
     gtk_box_append (GTK_BOX (picker), label);
     gtk_box_append (GTK_BOX (picker), button);
+    gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
+
+    label = gtk_label_new ("Application:");
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    gtk_widget_set_hexpand (label, TRUE);
+    gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1);
+
     app_picker = gtk_button_new_from_icon_name ("emblem-system-symbolic");
     gtk_widget_set_halign (app_picker, GTK_ALIGN_END);
     gtk_widget_set_sensitive (app_picker, FALSE);
     g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
-    gtk_box_append (GTK_BOX (picker), app_picker);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
-
-
-    label = gtk_label_new ("URI:");
-    gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
-
-    picker = gtk_button_new_with_label ("www.gtk.org");
-    g_signal_connect (picker, "clicked", G_CALLBACK (launch_uri), NULL);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
+    gtk_grid_attach (GTK_GRID (table), app_picker, 1, 4, 1, 1);
   }
 
   if (!gtk_widget_get_visible (window))

demos/print-editor/print-editor.c

@@ -6,8 +6,6 @@
 
 #include "demo_conf.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;

demos/widget-factory/widget-factory.c

@@ -2056,67 +2056,6 @@ hide_widget (GtkWidget *widget)
   gtk_widget_set_visible (widget, FALSE);
 }
 
-static void
-load_texture_thread (GTask *task,
-                     gpointer source_object,
-                     gpointer task_data,
-                     GCancellable *cancellable)
-{
-  const char *resource_path = (const char *) task_data;
-  GBytes *bytes;
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  bytes = g_resources_lookup_data (resource_path, 0, &error);
-  if (!bytes)
-    {
-      g_task_return_error (task, error);
-      return;
-    }
-
-  texture = gdk_texture_new_from_bytes (bytes, &error);
-  g_bytes_unref (bytes);
-
-  if (!texture)
-    {
-      g_task_return_error (task, error);
-      return;
-    }
-
-  g_task_return_pointer (task, texture, g_object_unref);
-}
-
-static void
-load_texture_done (GObject *source,
-                   GAsyncResult *result,
-                   gpointer data)
-{
-  GtkWidget *picture = GTK_WIDGET (source);
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  texture = g_task_propagate_pointer (G_TASK (result), &error);
-  if (!texture)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-}
-
-static void
-load_texture_in_thread (GtkWidget  *picture,
-                        const char *resource_path)
-{
-  GTask *task = g_task_new (picture, NULL, load_texture_done, NULL);
-  g_task_set_task_data (task, (gpointer)resource_path, NULL);
-  g_task_run_in_thread (task, load_texture_thread);
-  g_object_unref (task);
-}
-
 static void
 activate (GApplication *app)
 {
@@ -2216,13 +2155,6 @@ activate (GApplication *app)
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
 
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_sunset"),
-                          "/org/gtk/WidgetFactory4/sunset.jpg");
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_nyc"),
-                          "/org/gtk/WidgetFactory4/nyc.jpg");
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_beach"),
-                          "/org/gtk/WidgetFactory4/beach.jpg");
-
   if (g_strcmp0 (PROFILE, "devel") == 0)
     gtk_widget_add_css_class (GTK_WIDGET (window), "devel");
 
@@ -2252,13 +2184,11 @@ activate (GApplication *app)
   for (i = 0; i < G_N_ELEMENTS (accels); i++)
     gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
   action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
   g_action_map_add_action (G_ACTION_MAP (window), action);
   g_object_unref (G_OBJECT (action));
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
   action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
@@ -2432,7 +2362,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "record_button");
   g_object_set_data (G_OBJECT (window), "record_button", widget);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "lockbox");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "lockbutton");
   g_object_set_data (G_OBJECT (window), "lockbutton", widget2);
@@ -2450,7 +2379,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                           G_BINDING_SYNC_CREATE);
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission);
   g_object_unref (permission);
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "iconview1");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "increase_button");

demos/widget-factory/widget-factory.ui

@@ -1263,7 +1263,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_sunset">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
                                     <property name="content-fit">cover</property>
                                     <child>
                                       <object class="GtkDragSource">
@@ -1289,7 +1290,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_nyc">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/nyc.jpg</property>
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
@@ -1314,7 +1316,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_beach">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/beach.jpg</property>
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>

docs/reference/gdk/gdk4.toml.in

@@ -18,12 +18,12 @@ search_index = true
   docs_url = "https://docs.gtk.org/gobject/"
 
   [dependencies."Gio-2.0"]
-  name = "Gio"
+  name = "GIO"
   description = "GObject Interfaces and Objects, Networking, IPC, and I/O"
   docs_url = "https://docs.gtk.org/gio/"
 
   [dependencies."cairo-1.0"]
-  name = "cairo"
+  name = "Cairo"
   description = "A 2D graphics library with support for multiple output devices"
   docs_url = "https://www.cairographics.org/manual/"
 

docs/reference/gsk/gsk4.toml.in

@@ -19,7 +19,7 @@ dependencies = ["Graphene-1.0", "Gdk-4.0"]
   docs_url = "https://ebassi.github.io/graphene/docs/"
 
   [dependencies."Gdk-4.0"]
-  name = "Gdk"
+  name = "GDK"
   description = "The GTK windowing system abstraction"
   docs_url = "https://docs.gtk.org/gdk4/"
 

docs/reference/gtk/building.md

@@ -236,17 +236,23 @@ By default, GTK will try to build with support for the Vulkan graphics
 API in addition to cairo and OpenGL. This option can be used to explicitly
 control whether Vulkan should be used.
 
-### `media-gstreamer` and `media-ffmpeg`
+### `xinerama`
+
+By default, GTK will try to link against the Xinerama libraries
+if they are found. This option can be used to explicitly control
+whether Xinerama should be used.
+
+### `media`
 
 By default, GTK will try to build the gstreamer backend for
-media playback support. These option can be used to explicitly
+media playback support. This option can be used to explicitly
 control which media backends should be built.
 
-### `print-cups`
+### `print`
 
 By default, GTK will try to build various print backends
 if their dependencies are found. This option can be used
-to explicitly control whether the cups print backend should be built.
+to explicitly control which print backends should be built.
 
 ### `cloudproviders`
 
@@ -268,13 +274,18 @@ support in the file chooser.
 This option controls whether GTK should use colord for color
 calibration support in the cups print backend.
 
-### `gtk_doc`, `man-pages` and `update_screenshots`
+### `gtk_doc` and `man-pages`
 
-The *gi-docgen* package is used to generate the reference documentation
-included with GTK. By default support for *gi-docgen* is disabled
+The *gtk-doc* package is used to generate the reference documentation
+included with GTK. By default support for *gtk-doc* is disabled
 because it requires various extra dependencies to be installed.
-Introspection needs to be enabled, since the documentation is generated
-from introspection data.
+If you have *gtk-doc* and *pandoc* installed and are modifying GTK,
+you may want to enable *gtk-doc* support by passing in `-Dgtk_doc=true`.
+
+Additionally, some tools provided by GTK have their own
+manual pages generated using a similar set of dependencies;
+if you have *xsltproc* then you can generate manual pages by
+passing `-Dman-pages=true` when configuring the build.
 
 ### `introspection`
 
@@ -283,14 +294,9 @@ is mainly useful for shortening turnaround times on developer
 systems. Installed builds of GTK should always have introspection
 support.
 
-### `build-testsuite`
+### `build-tests`, `demos`
 
-If you want to run the testsuite to ensure that your GTK build
-works, you should enable it with this option.
-
-### `build-tests`, `build-examples`, `demos`
-
-By default, GTK will build quite a few tests, examples and demos.
+By default, GTK will build quite a few tests and demos.
 While these are useful on a developer system, they are not
 needed when GTK is built e.g. for a flatpak runtime. These
 options allow to disable building tests and demos.

docs/reference/gtk/gtk4.toml.in

@@ -14,12 +14,12 @@ search_index = true
 dependencies = ["Gdk-4.0", "Gsk-4.0"]
 
   [dependencies."Gdk-4.0"]
-  name = "Gdk"
+  name = "GDK"
   description = "The GTK windowing system abstraction"
   docs_url = "https://docs.gtk.org/gdk4/"
 
   [dependencies."Gsk-4.0"]
-  name = "Gsk"
+  name = "GSK"
   description = "The GTK rendering abstraction"
   docs_url = "https://docs.gtk.org/gsk4/"
 

docs/reference/gtk/migrating-4to5.md

@@ -105,17 +105,3 @@ retire it. If you need such a widget, it is relatively trivial to create one
 using a [class@Gtk.Revealer] with labels and buttons.
 
 Other libraries, such as libadwaita, may provide replacements as well.
-
-## gtk_show_uri is being replaced
-
-Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
-
-## GtkStatusbar is going away
-
-This is an oldfashioned widget that does not do all that much anymore, since
-it no longer has a resize handle for the window.
-
-## GtkLockButton is going away
-
-This is an very specialized widget that should better live with the application
-where it is used.

examples/hello/hello-world.c

@@ -37,7 +37,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);

gdk/broadway/broadway-protocol.h

@@ -213,7 +213,6 @@ typedef enum {
   BROADWAY_REQUEST_RELEASE_TEXTURE,
   BROADWAY_REQUEST_SET_NODES,
   BROADWAY_REQUEST_ROUNDTRIP,
-  BROADWAY_REQUEST_SET_MODAL_HINT,
 } BroadwayRequestType;
 
 typedef struct {
@@ -294,12 +293,6 @@ typedef struct {
   guint32 show_keyboard;
 } BroadwayRequestSetShowKeyboard;
 
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  gboolean modal_hint;
-} BroadwayRequestSetModalHint;
-
 typedef union {
   BroadwayRequestBase base;
   BroadwayRequestNewSurface new_surface;
@@ -319,7 +312,6 @@ typedef union {
   BroadwayRequestUploadTexture upload_texture;
   BroadwayRequestReleaseTexture release_texture;
   BroadwayRequestSetNodes set_nodes;
-  BroadwayRequestSetModalHint set_modal_hint;
 } BroadwayRequest;
 
 typedef enum {

gdk/broadway/broadway-server.c

@@ -124,7 +124,6 @@ struct BroadwaySurface {
   gboolean visible;
   gint32 transient_for;
   guint32 texture;
-  gboolean modal_hint;
   BroadwayNode *nodes;
   GHashTable *node_lookup;
 };
@@ -422,14 +421,6 @@ update_event_state (BroadwayServer *server,
       {
         surface->x = message->configure_notify.x;
         surface->y = message->configure_notify.y;
-
-	if (server->focused_surface_id != message->configure_notify.id &&
-	    server->pointer_grab_surface_id == -1 && surface->modal_hint)
-	{
-	  broadway_server_surface_raise (server, message->configure_notify.id);
-	  broadway_server_focus_surface (server, message->configure_notify.id);
-	  broadway_server_flush (server);
-	}
       }
     break;
   case BROADWAY_EVENT_ROUNDTRIP_NOTIFY:
@@ -1577,7 +1568,6 @@ broadway_server_destroy_surface (BroadwayServer *server,
                                  int id)
 {
   BroadwaySurface *surface;
-  gint32 transient_for = -1;
 
   if (server->mouse_in_surface_id == id)
     {
@@ -1595,24 +1585,11 @@ broadway_server_destroy_surface (BroadwayServer *server,
   surface = broadway_server_lookup_surface (server, id);
   if (surface != NULL)
     {
-      if (server->focused_surface_id == id)
-	transient_for = surface->transient_for;
-
       server->surfaces = g_list_remove (server->surfaces, surface);
       g_hash_table_remove (server->surface_id_hash,
                            GINT_TO_POINTER (id));
       broadway_surface_free (server, surface);
     }
-
-  if (transient_for != -1)
-    {
-      surface = broadway_server_lookup_surface (server, transient_for);
-      if (surface != NULL)
-        {
-	  broadway_server_focus_surface (server, transient_for);
-	  broadway_server_flush (server);
-	}
-    }
 }
 
 gboolean
@@ -1733,19 +1710,6 @@ broadway_server_surface_set_transient_for (BroadwayServer *server,
     }
 }
 
-void
-broadway_server_surface_set_modal_hint (BroadwayServer *server,
-                                        int id, gboolean modal_hint)
-{
-  BroadwaySurface *surface;
-
-  surface = broadway_server_lookup_surface (server, id);
-  if (surface == NULL)
-    return;
-
-  surface->modal_hint = modal_hint;
-}
-
 gboolean
 broadway_server_has_client (BroadwayServer *server)
 {

gdk/broadway/broadway-server.h

@@ -130,9 +130,6 @@ gboolean            broadway_server_surface_move_resize       (BroadwayServer  *
                                                                int              height);
 void                broadway_server_focus_surface             (BroadwayServer  *server,
                                                                int              new_focused_surface);
-void                broadway_server_surface_set_modal_hint    (BroadwayServer *server,
-                                                               int             id,
-                                                               gboolean        modal_hint);
 
 
 #endif /* __BROADWAY_SERVER__ */

gdk/broadway/broadwayd.c

@@ -380,11 +380,6 @@ client_handle_request (BroadwayClient *client,
     case BROADWAY_REQUEST_SET_SHOW_KEYBOARD:
       broadway_server_set_show_keyboard (server, request->set_show_keyboard.show_keyboard);
       break;
-    case BROADWAY_REQUEST_SET_MODAL_HINT:
-      broadway_server_surface_set_modal_hint (server,
-                                              request->set_modal_hint.id,
-                                              request->set_modal_hint.modal_hint);
-      break;
     default:
       g_warning ("Unknown request of type %d", request->base.type);
     }

gdk/broadway/gdkbroadway-server.c

@@ -561,18 +561,6 @@ _gdk_broadway_server_surface_set_transient_for (GdkBroadwayServer *server,
                                     BROADWAY_REQUEST_SET_TRANSIENT_FOR);
 }
 
-void
-_gdk_broadway_server_surface_set_modal_hint (GdkBroadwayServer *server,
-                                             int id, gboolean modal_hint)
-{
-  BroadwayRequestSetModalHint msg;
-
-  msg.id = id;
-  msg.modal_hint = modal_hint;
-  gdk_broadway_server_send_message (server, msg,
-				    BROADWAY_REQUEST_SET_MODAL_HINT);
-}
-
 static int
 open_shared_memory (void)
 {

gdk/broadway/gdkbroadway-server.h

@@ -78,8 +78,5 @@ gboolean           _gdk_broadway_server_surface_move_resize       (GdkBroadwaySe
 								  int                 y,
 								  int                 width,
 								  int                 height);
-void               _gdk_broadway_server_surface_set_modal_hint   (GdkBroadwayServer *server,
-                                                                  int                id,
-                                                                  gboolean           modal_hint);
 
 #endif /* __GDK_BROADWAY_SERVER__ */

gdk/broadway/gdkeventsource.c

@@ -82,27 +82,6 @@ gdk_event_source_check (GSource *source)
   return retval;
 }
 
-static void
-handle_focus_change (GdkEvent *event)
-{
-  GdkEvent *focus_event;
-  gboolean focus_in = (gdk_event_get_event_type (event) == GDK_ENTER_NOTIFY);
-
-  if (gdk_crossing_event_get_detail (event) == GDK_NOTIFY_INFERIOR)
-    return;
-
-  if (!gdk_crossing_event_get_focus (event) )
-    return;
-
-  focus_event = gdk_focus_event_new (gdk_event_get_surface (event),
-				     gdk_event_get_device (event),
-				     focus_in);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gdk_display_put_event (gdk_event_get_display (event), focus_event);
-G_GNUC_END_IGNORE_DEPRECATIONS
-  gdk_event_unref (focus_event);
-}
-
 void
 _gdk_broadway_events_got_input (GdkDisplay *display,
                                 BroadwayInputMsg *message)
@@ -131,8 +110,6 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
 
         node = _gdk_event_queue_append (display, event);
         _gdk_windowing_got_event (display, node, event, message->base.serial);
-
-	handle_focus_change (event);
       }
     break;
   case BROADWAY_EVENT_LEAVE:
@@ -149,8 +126,6 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
                                         message->crossing.mode,
                                         GDK_NOTIFY_ANCESTOR);
 
-	handle_focus_change (event);
-
         node = _gdk_event_queue_append (display, event);
         _gdk_windowing_got_event (display, node, event, message->base.serial);
       }

gdk/broadway/gdksurface-broadway.c

@@ -709,21 +709,6 @@ gdk_broadway_surface_set_transient_for (GdkSurface *surface,
   _gdk_broadway_server_surface_set_transient_for (display->server, impl->id, impl->transient_for);
 }
 
-static void
-gdk_broadway_surface_set_modal_hint (GdkSurface *surface,
-                                     gboolean   modal)
- {
-  GdkBroadwayDisplay *display;
-  GdkBroadwaySurface *impl;
-
-  impl = GDK_BROADWAY_SURFACE (surface);
-
-  impl->modal_hint = modal;
-
-  display = GDK_BROADWAY_DISPLAY (gdk_surface_get_display (surface));
-  _gdk_broadway_server_surface_set_modal_hint (display->server, impl->id, impl->modal_hint);
- }
-
 static void
 gdk_broadway_surface_get_geometry (GdkSurface *surface,
                                    int        *x,
@@ -1448,8 +1433,6 @@ gdk_broadway_toplevel_set_property (GObject      *object,
       break;
 
     case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
-      gdk_broadway_surface_set_modal_hint (surface, g_value_get_boolean (value));
-      g_object_notify_by_pspec (G_OBJECT (surface), pspec);
       break;
 
     case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
@@ -1496,10 +1479,6 @@ gdk_broadway_toplevel_get_property (GObject    *object,
       g_value_set_object (value, surface->transient_for);
       break;
 
-    case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
-      g_value_set_boolean (value, surface->modal_hint);
-      break;
-
     case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
       g_value_set_pointer (value, NULL);
       break;

gdk/broadway/gdksurface-broadway.h

@@ -54,7 +54,6 @@ struct _GdkBroadwaySurface
 
   gboolean dirty;
   gboolean last_synced;
-  gboolean modal_hint;
 
   GdkGeometry geometry_hints;
   GdkSurfaceHints geometry_hints_mask;

gdk/filetransferportal.c

@@ -26,7 +26,6 @@
 #include "gdkcontentformats.h"
 #include "gdkcontentserializer.h"
 #include "gdkcontentdeserializer.h"
-#include "gdkdebugprivate.h"
 
 #include <gio/gio.h>
 
@@ -214,8 +213,6 @@ file_transfer_portal_register_files (const char          **files,
   afd->len = g_strv_length ((char **)files);
   afd->start = 0;
 
-  GDK_DEBUG (DND, "file transfer portal: registering %d files", afd->len);
-
   g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
   g_variant_builder_add (&options, "{sv}", "writable", g_variant_new_boolean (writable));
   g_variant_builder_add (&options, "{sv}", "autostop", g_variant_new_boolean (TRUE));
@@ -351,8 +348,9 @@ portal_ready (GObject *object,
 static void
 portal_file_serializer (GdkContentSerializer *serializer)
 {
-  GPtrArray *files;
+  GFile *file;
   const GValue *value;
+  GPtrArray *files;
 
   files = g_ptr_array_new_with_free_func (g_free);
 
@@ -360,24 +358,9 @@ portal_file_serializer (GdkContentSerializer *serializer)
 
   if (G_VALUE_HOLDS (value, G_TYPE_FILE))
     {
-      GFile *file;
-
       file = g_value_get_object (gdk_content_serializer_get_value (serializer));
-
-      if (file && g_file_peek_path (file))
-        {
-          GDK_DEBUG (DND, "file transfer portal: Adding %s", g_file_peek_path (file));
-          g_ptr_array_add (files, g_file_get_path (file));
-        }
-#ifdef G_ENABLE_DEBUG
-      else if (GDK_DEBUG_CHECK (DND))
-        {
-          char *uri = g_file_get_uri (file);
-          gdk_debug_message ("file transfer portal: %s has no path, dropping\n", uri);
-          g_free (uri);
-        }
-#endif
-
+      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))
@@ -385,21 +368,7 @@ portal_file_serializer (GdkContentSerializer *serializer)
       GSList *l;
 
       for (l = g_value_get_boxed (value); l; l = l->next)
-        {
-          GFile *file = l->data;
-
-          if (file && g_file_peek_path (file))
-            {
-              GDK_DEBUG (DND, "file transfer portal: Adding %s", g_file_peek_path (file));
-              g_ptr_array_add (files, g_file_get_path (file));
-            }
-          else
-            {
-              char *uri = g_file_get_uri (file);
-              gdk_debug_message ("file transfer portal: %s has no path, dropping", uri);
-              g_free (uri);
-            }
-        }
+        g_ptr_array_add (files, g_file_get_path (l->data));
 
       g_ptr_array_add (files, NULL);
     }
@@ -426,15 +395,6 @@ portal_finish (GObject *object,
       return;
     }
 
-#ifdef G_ENABLE_DEBUG
-  if (GDK_DEBUG_CHECK (DND))
-    {
-      char *s = g_strjoinv (", ", files);
-      gdk_debug_message ("file transfer portal: Receiving files: %s", s);
-      g_free (s);
-    }
-#endif
-
   value = gdk_content_deserializer_get_value (deserializer);
   if (G_VALUE_HOLDS (value, G_TYPE_FILE))
     {

gdk/gdkdisplay.c

@@ -1149,7 +1149,7 @@ _gdk_display_get_next_serial (GdkDisplay *display)
  * [method@Gtk.Window.set_auto_startup_notification]
  * is called to disable that feature.
  *
- * Deprecated: 4.10: Using [method@Gdk.Toplevel.set_startup_id] is sufficient
+ * Deprecated: 4.10. Using gdk_toplevel_set_startup_id() is sufficient.
  */
 void
 gdk_display_notify_startup_complete (GdkDisplay  *display,
@@ -1168,8 +1168,6 @@ gdk_display_notify_startup_complete (GdkDisplay  *display,
  * if no ID has been defined.
  *
  * Returns: (nullable): the startup notification ID for @display
- *
- * Deprecated: 4.10
  */
 const char *
 gdk_display_get_startup_notification_id (GdkDisplay *display)
@@ -1779,11 +1777,11 @@ gdk_display_init_egl (GdkDisplay  *self,
 gpointer
 gdk_display_get_egl_display (GdkDisplay *self)
 {
-#ifdef HAVE_EGL
   GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
 
   g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
 
+#ifdef HAVE_EGL
   if (!priv->egl_display &&
       !gdk_display_prepare_gl (self, NULL))
     return NULL;

gdk/gdkdisplay.h

@@ -86,7 +86,7 @@ GdkClipboard *          gdk_display_get_primary_clipboard       (GdkDisplay
 GDK_DEPRECATED_IN_4_10_FOR(gdk_toplevel_set_startup_id)
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const char    *startup_id);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 const char * gdk_display_get_startup_notification_id (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL

gdk/gdkframeclockidle.c

@@ -621,11 +621,8 @@ gdk_frame_clock_paint_idle (void *data)
               priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
             }
 #ifdef G_ENABLE_DEBUG
-          if (GDK_DEBUG_CHECK (FRAMES))
-            {
-              if (timings)
-                timings->frame_end_time = g_get_monotonic_time ();
-            }
+            if (GDK_DEBUG_CHECK (FRAMES))
+              timings->frame_end_time = g_get_monotonic_time ();
 #endif /* G_ENABLE_DEBUG */
           G_GNUC_FALLTHROUGH;
 

gdk/gdkglcontext.c

@@ -501,18 +501,6 @@ gdk_gl_context_real_is_shared (GdkGLContext *self,
   return TRUE;
 }
 
-static gboolean
-gdk_gl_context_real_is_current (GdkGLContext *self)
-{
-#ifdef HAVE_EGL
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
-
-  return priv->egl_context == eglGetCurrentContext ();
-#else
-  return TRUE;
-#endif
-}
-
 static gboolean
 gdk_gl_context_real_clear_current (GdkGLContext *context)
 {
@@ -682,7 +670,6 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
   klass->is_shared = gdk_gl_context_real_is_shared;
   klass->make_current = gdk_gl_context_real_make_current;
   klass->clear_current = gdk_gl_context_real_clear_current;
-  klass->is_current = gdk_gl_context_real_is_current;
   klass->get_default_framebuffer = gdk_gl_context_real_get_default_framebuffer;
 
   draw_context_class->begin_frame = gdk_gl_context_real_begin_frame;
@@ -1564,12 +1551,6 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
   priv->extensions_checked = TRUE;
 }
 
-static gboolean
-gdk_gl_context_check_is_current (GdkGLContext *context)
-{
-  return GDK_GL_CONTEXT_GET_CLASS (context)->is_current (context);
-}
-
 /**
  * gdk_gl_context_make_current:
  * @context: a `GdkGLContext`
@@ -1588,7 +1569,7 @@ gdk_gl_context_make_current (GdkGLContext *context)
   masked_context = mask_context (context, surfaceless);
 
   current = g_private_get (&thread_current_context);
-  if (current == masked_context && gdk_gl_context_check_is_current (context))
+  if (current == masked_context)
     return;
 
   /* we need to realize the GdkGLContext if it wasn't explicitly realized */
@@ -1759,18 +1740,10 @@ GdkGLContext *
 gdk_gl_context_get_current (void)
 {
   MaskedContext *current;
-  GdkGLContext *context;
 
   current = g_private_get (&thread_current_context);
-  context = unmask_context (current);
 
-  if (context && !gdk_gl_context_check_is_current (context))
-    {
-      g_private_replace (&thread_current_context, NULL);
-      context = NULL;
-    }
-
-  return context;
+  return unmask_context (current);
 }
 
 gboolean

gdk/gdkglcontextprivate.h

@@ -83,7 +83,6 @@ struct _GdkGLContextClass
   gboolean              (* make_current)                        (GdkGLContext          *context,
                                                                  gboolean               surfaceless);
   gboolean              (* clear_current)                       (GdkGLContext          *context);
-  gboolean              (* is_current)                          (GdkGLContext          *context);
   cairo_region_t *      (* get_damage)                          (GdkGLContext          *context);
 
   gboolean              (* is_shared)                           (GdkGLContext          *self,

gdk/gdkgltexture.c

@@ -53,8 +53,10 @@ struct _GdkGLTextureClass {
 G_DEFINE_TYPE (GdkGLTexture, gdk_gl_texture, GDK_TYPE_TEXTURE)
 
 static void
-drop_gl_resources (GdkGLTexture *self)
+gdk_gl_texture_dispose (GObject *object)
 {
+  GdkGLTexture *self = GDK_GL_TEXTURE (object);
+
   if (self->destroy)
     {
       self->destroy (self->data);
@@ -64,29 +66,17 @@ drop_gl_resources (GdkGLTexture *self)
 
   g_clear_object (&self->context);
   self->id = 0;
-}
-
-static void
-gdk_gl_texture_dispose (GObject *object)
-{
-  GdkGLTexture *self = GDK_GL_TEXTURE (object);
-
-  drop_gl_resources (self);
 
   g_clear_object (&self->saved);
 
   G_OBJECT_CLASS (gdk_gl_texture_parent_class)->dispose (object);
 }
 
-typedef void (* GLFunc) (GdkGLTexture *self,
-                         GdkGLContext *context,
-                         gpointer      data);
-
 typedef struct _InvokeData
 {
   GdkGLTexture *self;
   volatile int spinlock;
-  GLFunc func;
+  GFunc func;
   gpointer data;
 } InvokeData;
 
@@ -101,7 +91,7 @@ gdk_gl_texture_invoke_callback (gpointer data)
   gdk_gl_context_make_current (context);
   glBindTexture (GL_TEXTURE_2D, invoke->self->id);
 
-  invoke->func (invoke->self, context, invoke->data);
+  invoke->func (invoke->self, invoke->data);
 
   g_atomic_int_set (&invoke->spinlock, 1);
 
@@ -110,7 +100,7 @@ gdk_gl_texture_invoke_callback (gpointer data)
 
 static void
 gdk_gl_texture_run (GdkGLTexture *self,
-                    GLFunc        func,
+                    GFunc         func,
                     gpointer      data)
 {
   InvokeData invoke = { self, 0, func, data };
@@ -155,19 +145,19 @@ gdk_gl_texture_find_format (gboolean         use_es,
 }
 
 static inline void
-gdk_gl_texture_do_download (GdkGLTexture *self,
-                            GdkGLContext *context,
-                            gpointer      download_)
+gdk_gl_texture_do_download (gpointer texture_,
+                            gpointer download_)
 {
-  GdkTexture *texture = GDK_TEXTURE (self);
   gsize expected_stride;
+  GdkGLTexture *self = texture_;
+  GdkTexture *texture = texture_;
   Download *download = download_;
   GLenum gl_internal_format, gl_format, gl_type;
 
   expected_stride = texture->width * gdk_memory_format_bytes_per_pixel (download->format);
 
   if (download->stride == expected_stride &&
-      !gdk_gl_context_get_use_es (context) &&
+      !gdk_gl_context_get_use_es (self->context) && 
       gdk_memory_format_gl_format (download->format, TRUE, &gl_internal_format, &gl_format, &gl_type))
     {
       glGetTexImage (GL_TEXTURE_2D,
@@ -185,11 +175,11 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
       glGenFramebuffers (1, &fbo);
       glBindFramebuffer (GL_FRAMEBUFFER, fbo);
       glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->id, 0);
-      if (gdk_gl_context_check_version (context, 4, 3, 3, 1))
+      if (gdk_gl_context_check_version (self->context, 4, 3, 3, 1))
         {
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_read_format);
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_read_type);
-          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (context), gl_read_format, gl_read_type, &actual_format))
+          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (self->context), gl_read_format, gl_read_type, &actual_format))
             actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
         }
       else
@@ -203,7 +193,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
           (download->stride == expected_stride))
         {
           glReadPixels (0, 0,
-                        texture->width, texture->height,
+                        texture->width, texture->height, 
                         gl_read_format,
                         gl_read_type,
                         download->data);
@@ -214,7 +204,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
           guchar *pixels = g_malloc_n (texture->width * actual_bpp, texture->height);
 
           glReadPixels (0, 0,
-                        texture->width, texture->height,
+                        texture->width, texture->height, 
                         gl_read_format,
                         gl_read_type,
                         pixels);
@@ -307,7 +297,15 @@ gdk_gl_texture_release (GdkGLTexture *self)
   self->saved = GDK_TEXTURE (gdk_memory_texture_from_texture (texture,
                                                               gdk_texture_get_format (texture)));
 
-  drop_gl_resources (self);
+  if (self->destroy)
+    {
+      self->destroy (self->data);
+      self->destroy = NULL;
+      self->data = NULL;
+    }
+
+  g_clear_object (&self->context);
+  self->id = 0;
 }
 
 static void

gdk/gdkmonitor.c

@@ -39,7 +39,6 @@
 
 enum {
   PROP_0,
-  PROP_DESCRIPTION,
   PROP_DISPLAY,
   PROP_MANUFACTURER,
   PROP_MODEL,
@@ -82,10 +81,6 @@ gdk_monitor_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, monitor->description);
-      break;
-
     case PROP_DISPLAY:
       g_value_set_object (value, monitor->display);
       break;
@@ -159,7 +154,6 @@ gdk_monitor_finalize (GObject *object)
 {
   GdkMonitor *monitor = GDK_MONITOR (object);
 
-  g_free (monitor->description);
   g_free (monitor->connector);
   g_free (monitor->manufacturer);
   g_free (monitor->model);
@@ -176,18 +170,6 @@ gdk_monitor_class_init (GdkMonitorClass *class)
   object_class->get_property = gdk_monitor_get_property;
   object_class->set_property = gdk_monitor_set_property;
 
-  /**
-   * GdkMonitor:description: (attributes org.gtk.Property.get=gdk_monitor_get_description)
-   *
-   * A short description of the monitor, meant for display to the user.
-   *
-   * Since: 4.10
-   */
-  props[PROP_DESCRIPTION] =
-    g_param_spec_string ("description", NULL, NULL,
-                         NULL,
-                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
   /**
    * GdkMonitor:display: (attributes org.gtk.Property.get=gdk_monitor_get_display)
    *
@@ -395,10 +377,6 @@ gdk_monitor_get_height_mm (GdkMonitor *monitor)
  *
  * Gets the name of the monitor's connector, if available.
  *
- * These are strings such as "eDP-1", or "HDMI-2". They depend
- * on software and hardware configuration, and should not be
- * relied on as stable identifiers of a specific monitor.
- *
  * Returns: (transfer none) (nullable): the name of the connector
  */
 const char *
@@ -641,33 +619,3 @@ gdk_monitor_is_valid (GdkMonitor *monitor)
 
   return monitor->valid;
 }
-
-/**
- * gdk_monitor_get_description: (attributes org.gtk.Method.get_property=description)
- * @monitor: a `GdkMonitor`
- *
- * Gets a string describing the monitor, if available.
- *
- * This can be used to identify a monitor in the UI.
- *
- * Returns: (transfer none) (nullable): the monitor description
- *
- * Since: 4.10
- */
-const char *
-gdk_monitor_get_description (GdkMonitor *monitor)
-{
-  g_return_val_if_fail (GDK_IS_MONITOR (monitor), NULL);
-
-  return monitor->description;
-}
-
-void
-gdk_monitor_set_description (GdkMonitor *monitor,
-                             const char *description)
-{
-  g_free (monitor->description);
-  monitor->description = g_strdup (description);
-  g_object_notify_by_pspec (G_OBJECT (monitor), props[PROP_DESCRIPTION]);
-}
-

gdk/gdkmonitor.h

@@ -86,8 +86,6 @@ GDK_AVAILABLE_IN_ALL
 GdkSubpixelLayout gdk_monitor_get_subpixel_layout (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_ALL
 gboolean          gdk_monitor_is_valid            (GdkMonitor   *monitor);
-GDK_AVAILABLE_IN_4_10
-const char *      gdk_monitor_get_description     (GdkMonitor   *monitor);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
 

gdk/gdkmonitorprivate.h

@@ -37,7 +37,6 @@ struct _GdkMonitor {
   char *manufacturer;
   char *model;
   char *connector;
-  char *description;
   GdkRectangle geometry;
   int width_mm;
   int height_mm;
@@ -71,8 +70,6 @@ void            gdk_monitor_set_refresh_rate    (GdkMonitor *monitor,
 void            gdk_monitor_set_subpixel_layout (GdkMonitor        *monitor,
                                                  GdkSubpixelLayout  subpixel);
 void            gdk_monitor_invalidate          (GdkMonitor *monitor);
-void            gdk_monitor_set_description     (GdkMonitor *monitor,
-                                                 const char *description);
 
 G_END_DECLS
 

gdk/gdktexture.c

@@ -463,7 +463,7 @@ gdk_texture_new_from_resource (const char *resource_path)
  * Creates a new texture by loading an image from a file.
  *
  * The file format is detected automatically. The supported formats
- * are PNG, JPEG and TIFF, though more formats might be available.
+ * are PNG and JPEG, though more formats might be available.
  *
  * If %NULL is returned, then @error will be set.
  *
@@ -556,7 +556,7 @@ gdk_texture_new_from_bytes_pixbuf (GBytes  *bytes,
  * Creates a new texture by loading an image from memory,
  *
  * The file format is detected automatically. The supported formats
- * are PNG, JPEG and TIFF, though more formats might be available.
+ * are PNG and JPEG, though more formats might be available.
  *
  * If %NULL is returned, then @error will be set.
  *
@@ -602,7 +602,7 @@ gdk_texture_new_from_bytes (GBytes  *bytes,
  * Creates a new texture by loading an image from a file.
  *
  * The file format is detected automatically. The supported formats
- * are PNG, JPEG and TIFF, though more formats might be available.
+ * are PNG and JPEG, though more formats might be available.
  *
  * If %NULL is returned, then @error will be set.
  *

gdk/macos/GdkMacosWindow.c

@@ -27,12 +27,10 @@
 #import "GdkMacosView.h"
 #import "GdkMacosWindow.h"
 
+#include "gdkmacosclipboard-private.h"
 #include "gdkmacosdisplay-private.h"
-#include "gdkmacosdrag-private.h"
 #include "gdkmacosdrop-private.h"
-#include "gdkmacoseventsource-private.h"
 #include "gdkmacosmonitor-private.h"
-#include "gdkmacospasteboard-private.h"
 #include "gdkmacossurface-private.h"
 #include "gdkmacospopupsurface-private.h"
 #include "gdkmacostoplevelsurface-private.h"
@@ -146,7 +144,7 @@ typedef NSString *CALayerContentsGravity;
        *
        * TODO: Can we improve grab breaking to fix this?
        */
-      _gdk_macos_display_send_event ([self gdkDisplay], event);
+      _gdk_macos_display_send_button_event ([self gdkDisplay], event);
 
       _gdk_macos_display_break_all_grabs (GDK_MACOS_DISPLAY (display), time);
 
@@ -248,7 +246,7 @@ typedef NSString *CALayerContentsGravity;
   [view release];
 
   /* TODO: We might want to make this more extensible at some point */
-  _gdk_macos_pasteboard_register_drag_types (self);
+  _gdk_macos_clipboard_register_drag_types (self);
 
   return self;
 }
@@ -670,61 +668,7 @@ typedef NSString *CALayerContentsGravity;
 }
 
 // NSDraggingSource protocol
-
-- (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context
-{
-  NSInteger sequence_number = [session draggingSequenceNumber];
-  GdkDisplay *display = gdk_surface_get_display (GDK_SURFACE (gdk_surface));
-  GdkDrag *drag = _gdk_macos_display_find_drag (GDK_MACOS_DISPLAY (display), sequence_number);
-  GdkModifierType state = _gdk_macos_display_get_current_keyboard_modifiers (GDK_MACOS_DISPLAY (display));
-
-  _gdk_macos_drag_set_actions (GDK_MACOS_DRAG (drag), state);
-
-  return _gdk_macos_drag_operation (GDK_MACOS_DRAG (drag));
-}
-
-- (void)draggingSession:(NSDraggingSession *)session willBeginAtPoint:(NSPoint)screenPoint
-{
-  NSInteger sequence_number = [session draggingSequenceNumber];
-  GdkDisplay *display = gdk_surface_get_display (GDK_SURFACE (gdk_surface));
-  GdkDrag *drag = _gdk_macos_display_find_drag (GDK_MACOS_DISPLAY (display), sequence_number);
-  int x, y;
-
-  _gdk_macos_display_from_display_coords (GDK_MACOS_DISPLAY (display), screenPoint.x, screenPoint.y, &x, &y);
-  _gdk_macos_drag_set_start_position (GDK_MACOS_DRAG (drag), x, y);
-  _gdk_macos_drag_surface_move (GDK_MACOS_DRAG (drag), x, y);
-}
-
-- (void)draggingSession:(NSDraggingSession *)session movedToPoint:(NSPoint)screenPoint
-{
-  NSInteger sequence_number = [session draggingSequenceNumber];
-  GdkMacosDisplay *display = GDK_MACOS_DISPLAY (gdk_surface_get_display (GDK_SURFACE (gdk_surface)));
-  GdkDrag *drag = _gdk_macos_display_find_drag (GDK_MACOS_DISPLAY (display), sequence_number);
-  int x, y;
-
-  _gdk_macos_display_send_event (display, [NSApp currentEvent]);
-
-  _gdk_macos_display_from_display_coords (display, screenPoint.x, screenPoint.y, &x, &y);
-  _gdk_macos_drag_surface_move (GDK_MACOS_DRAG (drag), x, y);
-}
-
-- (void)draggingSession:(NSDraggingSession *)session endedAtPoint:(NSPoint)screenPoint operation:(NSDragOperation)operation
-{
-  NSInteger sequence_number = [session draggingSequenceNumber];
-  GdkMacosDisplay *display = GDK_MACOS_DISPLAY (gdk_surface_get_display (GDK_SURFACE (gdk_surface)));
-  GdkDrag *drag = _gdk_macos_display_find_drag (display, sequence_number);
-
-  _gdk_macos_display_send_event (display, [NSApp currentEvent]);
-  gdk_drag_set_selected_action (drag, _gdk_macos_drag_ns_operation_to_action (operation));
-
-  if (gdk_drag_get_selected_action (drag) != 0)
-    g_signal_emit_by_name (drag, "drop-performed");
-  else
-    gdk_drag_cancel (drag, GDK_DRAG_CANCEL_NO_TARGET);
-
-  _gdk_macos_display_set_drag (display, [session draggingSequenceNumber], NULL);
-}
-
+// ...
 // end
 
 -(void)setStyleMask:(NSWindowStyleMask)styleMask

gdk/macos/GdkMacosWindow.h

@@ -32,7 +32,7 @@
 
 #define GDK_IS_MACOS_WINDOW(obj) ([obj isKindOfClass:[GdkMacosWindow class]])
 
-@interface GdkMacosWindow : NSWindow <NSDraggingSource, NSDraggingDestination> {
+@interface GdkMacosWindow : NSWindow {
   GdkMacosSurface *gdk_surface;
 
   BOOL             inMove;

gdk/macos/gdkmacosclipboard-private.h

@@ -24,7 +24,6 @@
 
 #include "gdkclipboardprivate.h"
 #include "gdkmacosdisplay-private.h"
-#include "gdkmacospasteboard-private.h"
 
 G_BEGIN_DECLS
 
@@ -42,6 +41,30 @@ NSPasteboardType   _gdk_macos_clipboard_to_ns_type                (const char
                                                                    NSPasteboardType     *alternate);
 const char        *_gdk_macos_clipboard_from_ns_type              (NSPasteboardType      ns_type);
 void               _gdk_macos_clipboard_register_drag_types       (NSWindow             *window);
+GdkContentFormats *_gdk_macos_pasteboard_load_formats             (NSPasteboard         *pasteboard);
+void               _gdk_macos_pasteboard_read_async               (GObject              *object,
+                                                                   NSPasteboard         *pasteboard,
+                                                                   GdkContentFormats    *formats,
+                                                                   int                   io_priority,
+                                                                   GCancellable         *cancellable,
+                                                                   GAsyncReadyCallback   callback,
+                                                                   gpointer              user_data);
+GInputStream      *_gdk_macos_pasteboard_read_finish              (GObject              *object,
+                                                                   GAsyncResult         *result,
+                                                                   const char          **out_mime_type,
+                                                                   GError              **error);
+
+@interface GdkMacosClipboardDataProvider : NSObject <NSPasteboardItemDataProvider>
+{
+  GCancellable  *cancellable;
+  GdkClipboard  *clipboard;
+  char         **mimeTypes;
+}
+
+-(id)initClipboard:(GdkClipboard *)gdkClipboard mimetypes:(const char * const *)mime_types;
+-(NSArray<NSPasteboardType> *)types;
+
+@end
 
 G_END_DECLS
 

gdk/macos/gdkmacosclipboard.c

@@ -22,7 +22,6 @@
 #include <glib/gi18n.h>
 
 #include "gdkmacosclipboard-private.h"
-#include "gdkmacospasteboard-private.h"
 #include "gdkmacosutils-private.h"
 #include "gdkprivate.h"
 
@@ -33,8 +32,163 @@ struct _GdkMacosClipboard
   NSInteger     last_change_count;
 };
 
+typedef struct
+{
+  GMemoryOutputStream *stream;
+  NSPasteboardItem    *item;
+  NSPasteboardType     type;
+  GMainContext        *main_context;
+  guint                done : 1;
+} WriteRequest;
+
+enum {
+  TYPE_STRING,
+  TYPE_PBOARD,
+  TYPE_URL,
+  TYPE_FILE_URL,
+  TYPE_COLOR,
+  TYPE_TIFF,
+  TYPE_PNG,
+  TYPE_LAST
+};
+
+#define PTYPE(k) (get_pasteboard_type(TYPE_##k))
+
+static NSPasteboardType pasteboard_types[TYPE_LAST];
+
 G_DEFINE_TYPE (GdkMacosClipboard, _gdk_macos_clipboard, GDK_TYPE_CLIPBOARD)
 
+static NSPasteboardType
+get_pasteboard_type (int type)
+{
+  static gsize initialized = FALSE;
+
+  g_assert (type >= 0);
+  g_assert (type < TYPE_LAST);
+
+  if (g_once_init_enter (&initialized))
+    {
+      pasteboard_types[TYPE_PNG] = NSPasteboardTypePNG;
+      pasteboard_types[TYPE_STRING] = NSPasteboardTypeString;
+      pasteboard_types[TYPE_TIFF] = NSPasteboardTypeTIFF;
+      pasteboard_types[TYPE_COLOR] = NSPasteboardTypeColor;
+
+      G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+      pasteboard_types[TYPE_PBOARD] = NSStringPboardType;
+      G_GNUC_END_IGNORE_DEPRECATIONS
+
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER
+      pasteboard_types[TYPE_URL] = NSPasteboardTypeURL;
+      pasteboard_types[TYPE_FILE_URL] = NSPasteboardTypeFileURL;
+#else
+      pasteboard_types[TYPE_URL] = [[NSString alloc] initWithUTF8String:"public.url"];
+      pasteboard_types[TYPE_FILE_URL] = [[NSString alloc] initWithUTF8String:"public.file-url"];
+#endif
+
+      g_once_init_leave (&initialized, TRUE);
+    }
+
+  return pasteboard_types[type];
+}
+
+static void
+write_request_free (WriteRequest *wr)
+{
+  g_clear_pointer (&wr->main_context, g_main_context_unref);
+  g_clear_object (&wr->stream);
+  [wr->item release];
+  g_slice_free (WriteRequest, wr);
+}
+
+const char *
+_gdk_macos_clipboard_from_ns_type (NSPasteboardType type)
+{
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
+  if ([type isEqualToString:PTYPE(STRING)] ||
+      [type isEqualToString:PTYPE(PBOARD)])
+    return g_intern_string ("text/plain;charset=utf-8");
+  else if ([type isEqualToString:PTYPE(URL)] ||
+           [type isEqualToString:PTYPE(FILE_URL)])
+    return g_intern_string ("text/uri-list");
+  else if ([type isEqualToString:PTYPE(COLOR)])
+    return g_intern_string ("application/x-color");
+  else if ([type isEqualToString:PTYPE(TIFF)])
+    return g_intern_string ("image/tiff");
+  else if ([type isEqualToString:PTYPE(PNG)])
+    return g_intern_string ("image/png");
+
+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
+  return NULL;
+}
+
+NSPasteboardType
+_gdk_macos_clipboard_to_ns_type (const char       *mime_type,
+                                 NSPasteboardType *alternate)
+{
+  if (alternate)
+    *alternate = NULL;
+
+  if (g_strcmp0 (mime_type, "text/plain;charset=utf-8") == 0)
+    {
+      return PTYPE(STRING);
+    }
+  else if (g_strcmp0 (mime_type, "text/uri-list") == 0)
+    {
+      if (alternate)
+        *alternate = PTYPE(URL);
+      return PTYPE(FILE_URL);
+    }
+  else if (g_strcmp0 (mime_type, "application/x-color") == 0)
+    {
+      return PTYPE(COLOR);
+    }
+  else if (g_strcmp0 (mime_type, "image/tiff") == 0)
+    {
+      return PTYPE(TIFF);
+    }
+  else if (g_strcmp0 (mime_type, "image/png") == 0)
+    {
+      return PTYPE(PNG);
+    }
+
+  return nil;
+}
+
+static void
+populate_content_formats (GdkContentFormatsBuilder *builder,
+                          NSPasteboardType          type)
+{
+  const char *mime_type;
+
+  g_return_if_fail (builder != NULL);
+  g_return_if_fail (type != NULL);
+
+  mime_type = _gdk_macos_clipboard_from_ns_type (type);
+
+  if (mime_type != NULL)
+    gdk_content_formats_builder_add_mime_type (builder, mime_type);
+}
+
+static GdkContentFormats *
+load_offer_formats (NSPasteboard *pasteboard)
+{
+  GDK_BEGIN_MACOS_ALLOC_POOL;
+
+  GdkContentFormatsBuilder *builder;
+  GdkContentFormats *formats;
+
+  builder = gdk_content_formats_builder_new ();
+  for (NSPasteboardType type in [pasteboard types])
+    populate_content_formats (builder, type);
+  formats = gdk_content_formats_builder_free_to_formats (builder);
+
+  GDK_END_MACOS_ALLOC_POOL;
+
+  return g_steal_pointer (&formats);
+}
+
 static void
 _gdk_macos_clipboard_load_contents (GdkMacosClipboard *self)
 {
@@ -45,13 +199,22 @@ _gdk_macos_clipboard_load_contents (GdkMacosClipboard *self)
 
   change_count = [self->pasteboard changeCount];
 
-  formats = _gdk_macos_pasteboard_load_formats (self->pasteboard);
+  formats = load_offer_formats (self->pasteboard);
   gdk_clipboard_claim_remote (GDK_CLIPBOARD (self), formats);
   gdk_content_formats_unref (formats);
 
   self->last_change_count = change_count;
 }
 
+static GInputStream *
+create_stream_from_nsdata (NSData *data)
+{
+  const guint8 *bytes = [data bytes];
+  gsize len = [data length];
+
+  return g_memory_input_stream_new_from_data (g_memdup2 (bytes, len), len, g_free);
+}
+
 static void
 _gdk_macos_clipboard_read_async (GdkClipboard        *clipboard,
                                  GdkContentFormats   *formats,
@@ -82,26 +245,34 @@ static void
 _gdk_macos_clipboard_send_to_pasteboard (GdkMacosClipboard  *self,
                                          GdkContentProvider *content)
 {
-  GdkMacosPasteboardItem *item;
-  NSArray<NSPasteboardItem *> *items;
-
-  g_assert (GDK_IS_MACOS_CLIPBOARD (self));
-  g_assert (GDK_IS_CONTENT_PROVIDER (content));
-
-  if (self->pasteboard == NULL)
-    return;
-
   GDK_BEGIN_MACOS_ALLOC_POOL;
 
-  item = [[GdkMacosPasteboardItem alloc] initForClipboard:GDK_CLIPBOARD (self) withContentProvider:content];
-  items = [NSArray arrayWithObject:item];
+  GdkMacosClipboardDataProvider *dataProvider;
+  GdkContentFormats *serializable;
+  NSPasteboardItem *item;
+  const char * const *mime_types;
+  gsize n_mime_types;
+
+  g_return_if_fail (GDK_IS_MACOS_CLIPBOARD (self));
+  g_return_if_fail (GDK_IS_CONTENT_PROVIDER (content));
+
+  serializable = gdk_content_provider_ref_storable_formats (content);
+  serializable = gdk_content_formats_union_serialize_mime_types (serializable);
+  mime_types = gdk_content_formats_get_mime_types (serializable, &n_mime_types);
+
+  dataProvider = [[GdkMacosClipboardDataProvider alloc] initClipboard:GDK_CLIPBOARD (self)
+                                                            mimetypes:mime_types];
+  item = [[NSPasteboardItem alloc] init];
+  [item setDataProvider:dataProvider forTypes:[dataProvider types]];
 
   [self->pasteboard clearContents];
-  if ([self->pasteboard writeObjects:items] == NO)
-    g_warning ("Failed to send clipboard to pasteboard");
+  if ([self->pasteboard writeObjects:[NSArray arrayWithObject:item]] == NO)
+    g_warning ("Failed to write object to pasteboard");
 
   self->last_change_count = [self->pasteboard changeCount];
 
+  g_clear_pointer (&serializable, gdk_content_formats_unref);
+
   GDK_END_MACOS_ALLOC_POOL;
 }
 
@@ -194,3 +365,305 @@ _gdk_macos_clipboard_check_externally_modified (GdkMacosClipboard *self)
   if ([self->pasteboard changeCount] != self->last_change_count)
     _gdk_macos_clipboard_load_contents (self);
 }
+
+@implementation GdkMacosClipboardDataProvider
+
+-(id)initClipboard:(GdkClipboard *)gdkClipboard mimetypes:(const char * const *)mime_types;
+{
+  [super init];
+
+  self->mimeTypes = g_strdupv ((char **)mime_types);
+  self->clipboard = g_object_ref (gdkClipboard);
+
+  return self;
+}
+
+-(void)dealloc
+{
+  g_cancellable_cancel (self->cancellable);
+
+  g_clear_pointer (&self->mimeTypes, g_strfreev);
+  g_clear_object (&self->clipboard);
+  g_clear_object (&self->cancellable);
+
+  [super dealloc];
+}
+
+-(void)pasteboardFinishedWithDataProvider:(NSPasteboard *)pasteboard
+{
+  g_clear_object (&self->clipboard);
+}
+
+-(NSArray<NSPasteboardType> *)types
+{
+  NSMutableArray *ret = [[NSMutableArray alloc] init];
+
+  for (guint i = 0; self->mimeTypes[i]; i++)
+    {
+      const char *mime_type = self->mimeTypes[i];
+      NSPasteboardType type;
+      NSPasteboardType alternate = nil;
+
+      if ((type = _gdk_macos_clipboard_to_ns_type (mime_type, &alternate)))
+        {
+          [ret addObject:type];
+          if (alternate)
+            [ret addObject:alternate];
+        }
+    }
+
+  return g_steal_pointer (&ret);
+}
+
+static void
+on_data_ready_cb (GObject      *object,
+                  GAsyncResult *result,
+                  gpointer      user_data)
+{
+  GDK_BEGIN_MACOS_ALLOC_POOL;
+
+  GdkClipboard *clipboard = (GdkClipboard *)object;
+  WriteRequest *wr = user_data;
+  GError *error = NULL;
+  NSData *data = nil;
+
+  g_assert (GDK_IS_CLIPBOARD (clipboard));
+  g_assert (G_IS_ASYNC_RESULT (result));
+  g_assert (wr != NULL);
+  g_assert (G_IS_MEMORY_OUTPUT_STREAM (wr->stream));
+  g_assert ([wr->item isKindOfClass:[NSPasteboardItem class]]);
+
+  if (gdk_clipboard_write_finish (clipboard, result, &error))
+    {
+      gsize size;
+      gpointer bytes;
+
+      g_output_stream_close (G_OUTPUT_STREAM (wr->stream), NULL, NULL);
+
+      size = g_memory_output_stream_get_data_size (wr->stream);
+      bytes = g_memory_output_stream_steal_data (wr->stream);
+      data = [[NSData alloc] initWithBytesNoCopy:bytes
+                                          length:size
+                                     deallocator:^(void *alloc, NSUInteger length) { g_free (alloc); }];
+    }
+  else
+    {
+      g_warning ("Failed to serialize clipboard contents: %s",
+                 error->message);
+      g_clear_error (&error);
+    }
+
+  [wr->item setData:data forType:wr->type];
+
+  wr->done = TRUE;
+
+  GDK_END_MACOS_ALLOC_POOL;
+}
+
+-(void)   pasteboard:(NSPasteboard *)pasteboard
+                item:(NSPasteboardItem *)item
+  provideDataForType:(NSPasteboardType)type
+{
+  const char *mime_type = _gdk_macos_clipboard_from_ns_type (type);
+  GMainContext *main_context = g_main_context_default ();
+  WriteRequest *wr;
+
+  if (self->clipboard == NULL || mime_type == NULL)
+    {
+      [item setData:[NSData data] forType:type];
+      return;
+    }
+
+  wr = g_slice_new0 (WriteRequest);
+  wr->item = [item retain];
+  wr->stream = G_MEMORY_OUTPUT_STREAM (g_memory_output_stream_new_resizable ());
+  wr->type = type;
+  wr->main_context = g_main_context_ref (main_context);
+  wr->done = FALSE;
+
+  gdk_clipboard_write_async (self->clipboard,
+                             mime_type,
+                             G_OUTPUT_STREAM (wr->stream),
+                             G_PRIORITY_DEFAULT,
+                             self->cancellable,
+                             on_data_ready_cb,
+                             wr);
+
+  /* We're forced to provide data synchronously via this API
+   * so we must block on the main loop. Using another main loop
+   * than the default tends to get us locked up here, so that is
+   * what we'll do for now.
+   */
+  while (!wr->done)
+    g_main_context_iteration (wr->main_context, TRUE);
+
+  write_request_free (wr);
+}
+
+void
+_gdk_macos_clipboard_register_drag_types (NSWindow *window)
+{
+  [window registerForDraggedTypes:[NSArray arrayWithObjects:PTYPE(STRING),
+                                                            PTYPE(PBOARD),
+                                                            PTYPE(URL),
+                                                            PTYPE(FILE_URL),
+                                                            PTYPE(COLOR),
+                                                            PTYPE(TIFF),
+                                                            PTYPE(PNG),
+                                                            nil]];
+}
+
+@end
+
+GdkContentFormats *
+_gdk_macos_pasteboard_load_formats (NSPasteboard *pasteboard)
+{
+  return load_offer_formats (pasteboard);
+}
+
+void
+_gdk_macos_pasteboard_read_async (GObject             *object,
+                                  NSPasteboard        *pasteboard,
+                                  GdkContentFormats   *formats,
+                                  int                  io_priority,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data)
+{
+  GDK_BEGIN_MACOS_ALLOC_POOL;
+
+  GdkContentFormats *offer_formats = NULL;
+  const char *mime_type;
+  GInputStream *stream = NULL;
+  GTask *task = NULL;
+
+  g_assert (G_IS_OBJECT (object));
+  g_assert (pasteboard != NULL);
+  g_assert (formats != NULL);
+
+  task = g_task_new (object, cancellable, callback, user_data);
+  g_task_set_source_tag (task, _gdk_macos_pasteboard_read_async);
+  g_task_set_priority (task, io_priority);
+
+  offer_formats = load_offer_formats (pasteboard);
+  mime_type = gdk_content_formats_match_mime_type (formats, offer_formats);
+
+  if (mime_type == NULL)
+    {
+      g_task_return_new_error (task,
+                               G_IO_ERROR,
+                               G_IO_ERROR_NOT_SUPPORTED,
+                               "%s",
+                               _("No compatible transfer format found"));
+      goto cleanup;
+    }
+
+  if (strcmp (mime_type, "text/plain;charset=utf-8") == 0)
+    {
+      NSString *nsstr = [pasteboard stringForType:NSPasteboardTypeString];
+
+      if (nsstr != NULL)
+        {
+          const char *str = [nsstr UTF8String];
+          stream = g_memory_input_stream_new_from_data (g_strdup (str),
+                                                        strlen (str) + 1,
+                                                        g_free);
+        }
+    }
+  else if (strcmp (mime_type, "text/uri-list") == 0)
+    {
+      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
+      if ([[pasteboard types] containsObject:PTYPE(FILE_URL)])
+        {
+          GString *str = g_string_new (NULL);
+          NSArray *files = [pasteboard propertyListForType:NSFilenamesPboardType];
+          gsize n_files = [files count];
+          char *data;
+          guint len;
+
+          for (gsize i = 0; i < n_files; ++i)
+            {
+              NSString* uriString = [files objectAtIndex:i];
+              uriString = [@"file://" stringByAppendingString:uriString];
+              uriString = [uriString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+
+              g_string_append_printf (str,
+                                      "%s\r\n",
+                                      [uriString cStringUsingEncoding:NSUTF8StringEncoding]);
+            }
+
+          len = str->len;
+          data = g_string_free (str, FALSE);
+          stream = g_memory_input_stream_new_from_data (data, len, g_free);
+        }
+
+      G_GNUC_END_IGNORE_DEPRECATIONS;
+    }
+  else if (strcmp (mime_type, "application/x-color") == 0)
+    {
+      NSColorSpace *colorspace;
+      NSColor *nscolor;
+      guint16 color[4];
+
+      colorspace = [NSColorSpace genericRGBColorSpace];
+      nscolor = [[NSColor colorFromPasteboard:pasteboard]
+                    colorUsingColorSpace:colorspace];
+
+      color[0] = 0xffff * [nscolor redComponent];
+      color[1] = 0xffff * [nscolor greenComponent];
+      color[2] = 0xffff * [nscolor blueComponent];
+      color[3] = 0xffff * [nscolor alphaComponent];
+
+      stream = g_memory_input_stream_new_from_data (g_memdup2 (&color, sizeof color),
+                                                    sizeof color,
+                                                    g_free);
+    }
+  else if (strcmp (mime_type, "image/tiff") == 0)
+    {
+      NSData *data = [pasteboard dataForType:PTYPE(TIFF)];
+      stream = create_stream_from_nsdata (data);
+    }
+  else if (strcmp (mime_type, "image/png") == 0)
+    {
+      NSData *data = [pasteboard dataForType:PTYPE(PNG)];
+      stream = create_stream_from_nsdata (data);
+    }
+
+  if (stream != NULL)
+    {
+      g_task_set_task_data (task, g_strdup (mime_type), g_free);
+      g_task_return_pointer (task, g_steal_pointer (&stream), g_object_unref);
+    }
+  else
+    {
+      g_task_return_new_error (task,
+                               G_IO_ERROR,
+                               G_IO_ERROR_FAILED,
+                               _("Failed to decode contents with mime-type of '%s'"),
+                               mime_type);
+    }
+
+cleanup:
+  g_clear_object (&task);
+  g_clear_pointer (&offer_formats, gdk_content_formats_unref);
+
+  GDK_END_MACOS_ALLOC_POOL;
+}
+
+GInputStream *
+_gdk_macos_pasteboard_read_finish (GObject       *object,
+                                   GAsyncResult  *result,
+                                   const char   **out_mime_type,
+                                   GError       **error)
+{
+  GTask *task = (GTask *)result;
+
+  g_assert (G_IS_OBJECT (object));
+  g_assert (G_IS_TASK (task));
+
+  if (out_mime_type != NULL)
+    *out_mime_type = g_strdup (g_task_get_task_data (task));
+
+  return g_task_propagate_pointer (task, error);
+}

gdk/macos/gdkmacoscursor.c

@@ -23,10 +23,6 @@
 
 #include "gdkmacoscursor-private.h"
 
-@interface NSCursor()
--(long long)_coreCursorType;
-@end
-
 /* OS X only exports a number of cursor types in its public NSCursor interface.
  * By overriding the private _coreCursorType method, we can tell OS X to load
  * one of its internal cursors instead (since cursor images are loaded on demand

gdk/macos/gdkmacosdisplay-private.h

@@ -155,13 +155,12 @@ void             _gdk_macos_display_surface_became_key             (GdkMacosDisp
                                                                     GdkMacosSurface *surface);
 void             _gdk_macos_display_clear_sorting                  (GdkMacosDisplay *self);
 const GList     *_gdk_macos_display_get_surfaces                   (GdkMacosDisplay *self);
-void             _gdk_macos_display_send_event                     (GdkMacosDisplay *self,
+void             _gdk_macos_display_send_button_event              (GdkMacosDisplay *self,
                                                                     NSEvent         *nsevent);
 void             _gdk_macos_display_warp_pointer                   (GdkMacosDisplay *self,
                                                                     int              x,
                                                                     int              y);
 NSEvent         *_gdk_macos_display_get_nsevent                    (GdkEvent        *event);
-NSEvent         *_gdk_macos_display_get_last_nsevent               (void);
 GdkDrag         *_gdk_macos_display_find_drag                      (GdkMacosDisplay *self,
                                                                     NSInteger        sequence_number);
 GdkDrop         *_gdk_macos_display_find_drop                      (GdkMacosDisplay *self,

gdk/macos/gdkmacosdisplay-translate.c

@@ -723,85 +723,6 @@ fill_scroll_event (GdkMacosDisplay *self,
   return g_steal_pointer (&ret);
 }
 
-
-static GdkEvent *
-fill_event (GdkMacosDisplay *self,
-            GdkMacosWindow  *window,
-            NSEvent         *nsevent,
-            int              x,
-            int              y)
-{
-  GdkMacosSurface *surface = [window gdkSurface];
-  NSEventType event_type = [nsevent type];
-  GdkEvent *ret = NULL;
-
-  switch ((int)event_type)
-    {
-    case NSEventTypeLeftMouseDown:
-    case NSEventTypeRightMouseDown:
-    case NSEventTypeOtherMouseDown:
-    case NSEventTypeLeftMouseUp:
-    case NSEventTypeRightMouseUp:
-    case NSEventTypeOtherMouseUp:
-      ret = fill_button_event (self, surface, nsevent, x, y);
-      break;
-
-    case NSEventTypeLeftMouseDragged:
-    case NSEventTypeRightMouseDragged:
-    case NSEventTypeOtherMouseDragged:
-    case NSEventTypeMouseMoved:
-      ret = fill_motion_event (self, surface, nsevent, x, y);
-      break;
-
-    case NSEventTypeMagnify:
-    case NSEventTypeRotate:
-      ret = fill_pinch_event (self, surface, nsevent, x, y);
-      break;
-
-    case NSEventTypeMouseExited:
-    case NSEventTypeMouseEntered:
-      {
-        GdkSeat *seat = gdk_display_get_default_seat (GDK_DISPLAY (self));
-        GdkDevice *pointer = gdk_seat_get_pointer (seat);
-        GdkDeviceGrabInfo *grab = _gdk_display_get_last_device_grab (GDK_DISPLAY (self), pointer);
-
-        if ([(GdkMacosWindow *)window isInManualResizeOrMove])
-          {
-            ret = GDK_MACOS_EVENT_DROP;
-          }
-        else if (grab == NULL || grab->owner_events)
-          {
-            if (event_type == NSEventTypeMouseExited)
-              [[NSCursor arrowCursor] set];
-
-            ret = synthesize_crossing_event (self, surface, nsevent, x, y);
-          }
-      }
-
-      break;
-
-    case NSEventTypeKeyDown:
-    case NSEventTypeKeyUp:
-    case NSEventTypeFlagsChanged: {
-      GdkEventType type = _gdk_macos_keymap_get_event_type (nsevent);
-
-      if (type)
-        ret = fill_key_event (self, surface, nsevent, type);
-
-      break;
-    }
-
-    case NSEventTypeScrollWheel:
-      ret = fill_scroll_event (self, surface, nsevent, x, y);
-      break;
-
-    default:
-      break;
-    }
-
-  return ret;
-}
-
 static gboolean
 is_mouse_button_press_event (NSEventType type)
 {
@@ -1104,12 +1025,16 @@ find_surface_for_ns_event (GdkMacosDisplay *self,
   GdkMacosBaseView *view;
   GdkSurface *surface;
   NSPoint point;
+  int x_tmp;
+  int y_tmp;
 
   g_assert (GDK_IS_MACOS_DISPLAY (self));
   g_assert (nsevent != NULL);
   g_assert (x != NULL);
   g_assert (y != NULL);
 
+  _gdk_macos_display_from_display_coords (self, point.x, point.y, &x_tmp, &y_tmp);
+
   switch ((int)[nsevent type])
     {
     case NSEventTypeLeftMouseDown:
@@ -1158,6 +1083,7 @@ _gdk_macos_display_translate (GdkMacosDisplay *self,
   GdkMacosWindow *window;
   NSEventType event_type;
   NSWindow *event_window;
+  GdkEvent *ret = NULL;
   int x;
   int y;
 
@@ -1265,15 +1191,79 @@ _gdk_macos_display_translate (GdkMacosDisplay *self,
           _gdk_macos_display_clear_sorting (self);
         }
     }
-  return fill_event (self, window, nsevent, x, y);
+
+  switch ((int)event_type)
+    {
+    case NSEventTypeLeftMouseDown:
+    case NSEventTypeRightMouseDown:
+    case NSEventTypeOtherMouseDown:
+    case NSEventTypeLeftMouseUp:
+    case NSEventTypeRightMouseUp:
+    case NSEventTypeOtherMouseUp:
+      ret = fill_button_event (self, surface, nsevent, x, y);
+      break;
+
+    case NSEventTypeLeftMouseDragged:
+    case NSEventTypeRightMouseDragged:
+    case NSEventTypeOtherMouseDragged:
+    case NSEventTypeMouseMoved:
+      ret = fill_motion_event (self, surface, nsevent, x, y);
+      break;
+
+    case NSEventTypeMagnify:
+    case NSEventTypeRotate:
+      ret = fill_pinch_event (self, surface, nsevent, x, y);
+      break;
+
+    case NSEventTypeMouseExited:
+    case NSEventTypeMouseEntered:
+      {
+        GdkSeat *seat = gdk_display_get_default_seat (GDK_DISPLAY (self));
+        GdkDevice *pointer = gdk_seat_get_pointer (seat);
+        GdkDeviceGrabInfo *grab = _gdk_display_get_last_device_grab (GDK_DISPLAY (self), pointer);
+
+        if ([(GdkMacosWindow *)window isInManualResizeOrMove])
+          {
+            ret = GDK_MACOS_EVENT_DROP;
+          }
+        else if (grab == NULL)
+          {
+            if (event_type == NSEventTypeMouseExited)
+              [[NSCursor arrowCursor] set];
+
+            ret = synthesize_crossing_event (self, surface, nsevent, x, y);
+          }
+      }
+
+      break;
+
+    case NSEventTypeKeyDown:
+    case NSEventTypeKeyUp:
+    case NSEventTypeFlagsChanged: {
+      GdkEventType type = _gdk_macos_keymap_get_event_type (nsevent);
+
+      if (type)
+        ret = fill_key_event (self, surface, nsevent, type);
+
+      break;
+    }
+
+    case NSEventTypeScrollWheel:
+      ret = fill_scroll_event (self, surface, nsevent, x, y);
+      break;
+
+    default:
+      break;
+    }
+
+  return ret;
 }
 
 void
-_gdk_macos_display_send_event (GdkMacosDisplay *self,
-                               NSEvent         *nsevent)
+_gdk_macos_display_send_button_event (GdkMacosDisplay *self,
+                                      NSEvent         *nsevent)
 {
   GdkMacosSurface *surface;
-  GdkMacosWindow *window;
   GdkEvent *event;
   int x;
   int y;
@@ -1282,8 +1272,7 @@ _gdk_macos_display_send_event (GdkMacosDisplay *self,
   g_return_if_fail (nsevent != NULL);
 
   if ((surface = find_surface_for_ns_event (self, nsevent, &x, &y)) &&
-      (window = (GdkMacosWindow *)_gdk_macos_surface_get_native (surface)) &&
-      (event = fill_event (self, window, nsevent, x, y)))
+      (event = fill_button_event (self, surface, nsevent, x, y)))
     _gdk_windowing_got_event (GDK_DISPLAY (self),
                               _gdk_event_queue_append (GDK_DISPLAY (self), event),
                               event,

gdk/macos/gdkmacosdisplay.c

@@ -1024,16 +1024,6 @@ _gdk_macos_display_get_nsevent (GdkEvent *event)
   return NULL;
 }
 
-NSEvent *
-_gdk_macos_display_get_last_nsevent ()
-{
-  const GdkToNSEventMap *map = g_queue_peek_tail (&event_map);
-  if (map)
-    return map->nsevent;
-
-  return NULL;
-}
-
 GdkDrag *
 _gdk_macos_display_find_drag (GdkMacosDisplay *self,
                               NSInteger        sequence_number)

gdk/macos/gdkmacosdrag-private.h

@@ -41,6 +41,7 @@ struct _GdkMacosDrag
   GdkDrag parent_instance;
 
   GdkMacosDragSurface *drag_surface;
+  GdkSeat *drag_seat;
   GdkCursor *cursor;
 
   int hot_x;
@@ -61,22 +62,8 @@ struct _GdkMacosDragClass
   GdkDragClass parent_class;
 };
 
-GType            gdk_macos_drag_get_type           (void) G_GNUC_CONST;
-gboolean        _gdk_macos_drag_begin              (GdkMacosDrag       *self,
-                                                    GdkContentProvider *content,
-                                                    GdkMacosWindow     *window);
-NSDragOperation _gdk_macos_drag_operation          (GdkMacosDrag       *self);
-GdkDragAction   _gdk_macos_drag_ns_operation_to_action
-                                                   (NSDragOperation operation);
-void            _gdk_macos_drag_surface_move       (GdkMacosDrag   *self,
-                                                    int             x_root,
-                                                    int             y_root);
-void            _gdk_macos_drag_set_start_position (GdkMacosDrag   *self,
-                                                    int             start_x,
-                                                    int             start_y);
-void            _gdk_macos_drag_set_actions        (GdkMacosDrag   *self,
-                                                    GdkModifierType mods);
-
+GType    gdk_macos_drag_get_type (void) G_GNUC_CONST;
+gboolean _gdk_macos_drag_begin   (GdkMacosDrag *self);
 
 G_END_DECLS
 

gdk/macos/gdkmacosdrag.c

@@ -25,7 +25,6 @@
 #include "gdkmacoscursor-private.h"
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacosdragsurface-private.h"
-#include "gdkmacospasteboard-private.h"
 
 #include "gdk/gdkdeviceprivate.h"
 #include "gdk/gdkeventsprivate.h"
@@ -188,6 +187,47 @@ gdk_macos_drag_set_cursor (GdkDrag   *drag,
     [nscursor set];
 }
 
+static gboolean
+drag_grab (GdkMacosDrag *self)
+{
+  GdkSeat *seat;
+
+  g_assert (GDK_IS_MACOS_DRAG (self));
+
+  seat = gdk_device_get_seat (gdk_drag_get_device (GDK_DRAG (self)));
+
+  if (gdk_seat_grab (seat,
+                     GDK_SURFACE (self->drag_surface),
+                     GDK_SEAT_CAPABILITY_ALL_POINTING,
+                     FALSE,
+                     self->cursor,
+                     NULL,
+                     NULL,
+                     NULL) != GDK_GRAB_SUCCESS)
+    return FALSE;
+
+  g_set_object (&self->drag_seat, seat);
+
+  return TRUE;
+}
+
+static void
+drag_ungrab (GdkMacosDrag *self)
+{
+  GdkDisplay *display;
+
+  g_assert (GDK_IS_MACOS_DRAG (self));
+
+  if (self->drag_seat)
+    {
+      gdk_seat_ungrab (self->drag_seat);
+      g_clear_object (&self->drag_seat);
+    }
+
+  display = gdk_drag_get_display (GDK_DRAG (self));
+  _gdk_macos_display_break_all_grabs (GDK_MACOS_DISPLAY (display), GDK_CURRENT_TIME);
+}
+
 static void
 gdk_macos_drag_cancel (GdkDrag             *drag,
                        GdkDragCancelReason  reason)
@@ -200,6 +240,7 @@ gdk_macos_drag_cancel (GdkDrag             *drag,
     return;
 
   self->cancelled = TRUE;
+  drag_ungrab (self);
   gdk_drag_drop_done (drag, FALSE);
 }
 
@@ -212,6 +253,7 @@ gdk_macos_drag_drop_performed (GdkDrag *drag,
   g_assert (GDK_IS_MACOS_DRAG (self));
 
   g_object_ref (self);
+  drag_ungrab (self);
   g_signal_emit_by_name (drag, "dnd-finished");
   gdk_drag_drop_done (drag, TRUE);
   g_object_unref (self);
@@ -274,6 +316,225 @@ gdk_drag_get_current_actions (GdkModifierType  state,
     }
 }
 
+static void
+gdk_drag_update (GdkDrag         *drag,
+                 double           x_root,
+                 double           y_root,
+                 GdkModifierType  mods,
+                 guint32          evtime)
+{
+  GdkMacosDrag *self = (GdkMacosDrag *)drag;
+  GdkDragAction suggested_action;
+  GdkDragAction possible_actions;
+
+  g_assert (GDK_IS_MACOS_DRAG (self));
+
+  self->last_x = x_root;
+  self->last_y = y_root;
+
+  gdk_drag_get_current_actions (mods,
+                                GDK_BUTTON_PRIMARY,
+                                gdk_drag_get_actions (drag),
+                                &suggested_action,
+                                &possible_actions);
+
+  if (GDK_IS_MACOS_SURFACE (self->drag_surface))
+    _gdk_macos_surface_move (GDK_MACOS_SURFACE (self->drag_surface),
+                             x_root - self->hot_x,
+                             y_root - self->hot_y);
+
+  if (!self->did_update)
+    {
+      self->start_x = self->last_x;
+      self->start_y = self->last_y;
+      self->did_update = TRUE;
+    }
+
+  gdk_drag_set_actions (drag, possible_actions);
+}
+
+static gboolean
+gdk_dnd_handle_motion_event (GdkDrag  *drag,
+                             GdkEvent *event)
+{
+  double x, y;
+  int x_root, y_root;
+
+  g_assert (GDK_IS_MACOS_DRAG (drag));
+  g_assert (event != NULL);
+
+  /* Ignore motion while doing zoomback */
+  if (GDK_MACOS_DRAG (drag)->cancelled)
+    return FALSE;
+
+  gdk_event_get_position (event, &x, &y);
+  x_root = event->surface->x + x;
+  y_root = event->surface->y + y;
+  gdk_drag_update (drag, x_root, y_root,
+                   gdk_event_get_modifier_state (event),
+                   gdk_event_get_time (event));
+
+  return TRUE;
+}
+
+static gboolean
+gdk_dnd_handle_grab_broken_event (GdkDrag  *drag,
+                                  GdkEvent *event)
+{
+  GdkMacosDrag *self = GDK_MACOS_DRAG (drag);
+  gboolean is_implicit = gdk_grab_broken_event_get_implicit (event);
+  GdkSurface *grab_surface = gdk_grab_broken_event_get_grab_surface (event);
+
+  /* Don't cancel if we break the implicit grab from the initial button_press. */
+  if (is_implicit || grab_surface == (GdkSurface *)self->drag_surface)
+    return FALSE;
+
+  if (gdk_event_get_device (event) != gdk_drag_get_device (drag))
+    return FALSE;
+
+  gdk_drag_cancel (drag, GDK_DRAG_CANCEL_ERROR);
+
+  return TRUE;
+}
+
+static gboolean
+gdk_dnd_handle_button_event (GdkDrag  *drag,
+                             GdkEvent *event)
+{
+  GdkMacosDrag *self = GDK_MACOS_DRAG (drag);
+
+  g_assert (GDK_IS_MACOS_DRAG (self));
+  g_assert (event != NULL);
+
+#if 0
+  /* FIXME: Check the button matches */
+  if (event->button != self->button)
+    return FALSE;
+#endif
+
+  if (gdk_drag_get_selected_action (drag) != 0)
+    g_signal_emit_by_name (drag, "drop-performed");
+  else
+    gdk_drag_cancel (drag, GDK_DRAG_CANCEL_NO_TARGET);
+
+  return TRUE;
+}
+
+static gboolean
+gdk_dnd_handle_key_event (GdkDrag  *drag,
+                          GdkEvent *event)
+{
+  GdkMacosDrag *self = GDK_MACOS_DRAG (drag);
+  GdkModifierType state;
+  GdkDevice *pointer;
+  GdkSeat *seat;
+  int dx, dy;
+
+  dx = dy = 0;
+  state = gdk_event_get_modifier_state (event);
+  seat = gdk_event_get_seat (event);
+  pointer = gdk_seat_get_pointer (seat);
+
+  if (event->event_type == GDK_KEY_PRESS)
+    {
+      guint keyval = gdk_key_event_get_keyval (event);
+
+      switch (keyval)
+        {
+        case GDK_KEY_Escape:
+          gdk_drag_cancel (drag, GDK_DRAG_CANCEL_USER_CANCELLED);
+          return TRUE;
+
+        case GDK_KEY_space:
+        case GDK_KEY_Return:
+        case GDK_KEY_ISO_Enter:
+        case GDK_KEY_KP_Enter:
+        case GDK_KEY_KP_Space:
+          if (gdk_drag_get_selected_action (drag) != 0)
+            g_signal_emit_by_name (drag, "drop-performed");
+          else
+            gdk_drag_cancel (drag, GDK_DRAG_CANCEL_NO_TARGET);
+
+          return TRUE;
+
+        case GDK_KEY_Up:
+        case GDK_KEY_KP_Up:
+          dy = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
+          break;
+
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Down:
+          dy = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
+          break;
+
+        case GDK_KEY_Left:
+        case GDK_KEY_KP_Left:
+          dx = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
+          break;
+
+        case GDK_KEY_Right:
+        case GDK_KEY_KP_Right:
+          dx = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  /* The state is not yet updated in the event, so we need
+   * to query it here. We could use XGetModifierMapping, but
+   * that would be overkill.
+   */
+  gdk_macos_device_query_state (pointer, NULL, NULL, NULL, NULL, &state);
+
+  if (dx != 0 || dy != 0)
+    {
+      GdkDisplay *display = gdk_event_get_display ((GdkEvent *)event);
+
+      self->last_x += dx;
+      self->last_y += dy;
+
+      _gdk_macos_display_warp_pointer (GDK_MACOS_DISPLAY (display),
+                                       self->last_x,
+                                       self->last_y);
+    }
+
+  gdk_drag_update (drag,
+                   self->last_x, self->last_y,
+                   state,
+                   gdk_event_get_time (event));
+
+  return TRUE;
+}
+
+static gboolean
+gdk_macos_drag_handle_event (GdkDrag  *drag,
+                             GdkEvent *event)
+{
+  g_assert (GDK_IS_MACOS_DRAG (drag));
+  g_assert (event != NULL);
+
+  switch ((guint) event->event_type)
+    {
+    case GDK_MOTION_NOTIFY:
+      return gdk_dnd_handle_motion_event (drag, event);
+
+    case GDK_BUTTON_RELEASE:
+      return gdk_dnd_handle_button_event (drag, event);
+
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      return gdk_dnd_handle_key_event (drag, event);
+
+    case GDK_GRAB_BROKEN:
+      return gdk_dnd_handle_grab_broken_event (drag, event);
+
+    default:
+      return FALSE;
+    }
+}
+
 static void
 gdk_macos_drag_finalize (GObject *object)
 {
@@ -281,6 +542,11 @@ gdk_macos_drag_finalize (GObject *object)
   GdkMacosDragSurface *drag_surface = g_steal_pointer (&self->drag_surface);
 
   g_clear_object (&self->cursor);
+  if (self->drag_seat)
+    {
+      gdk_seat_ungrab (self->drag_seat);
+      g_clear_object (&self->drag_seat);
+    }
 
   G_OBJECT_CLASS (gdk_macos_drag_parent_class)->finalize (object);
 
@@ -342,6 +608,7 @@ gdk_macos_drag_class_init (GdkMacosDragClass *klass)
   drag_class->set_cursor = gdk_macos_drag_set_cursor;
   drag_class->cancel = gdk_macos_drag_cancel;
   drag_class->drop_performed = gdk_macos_drag_drop_performed;
+  drag_class->handle_event = gdk_macos_drag_handle_event;
 
   properties [PROP_DRAG_SURFACE] =
     g_param_spec_object ("drag-surface", NULL, NULL,
@@ -357,113 +624,11 @@ gdk_macos_drag_init (GdkMacosDrag *self)
 }
 
 gboolean
-_gdk_macos_drag_begin (GdkMacosDrag       *self,
-                       GdkContentProvider *content,
-                       GdkMacosWindow     *window)
+_gdk_macos_drag_begin (GdkMacosDrag *self)
 {
-  NSArray<NSDraggingItem *> *items;
-  NSDraggingSession *session;
-  NSPasteboardItem *item;
-  NSEvent *nsevent;
-
   g_return_val_if_fail (GDK_IS_MACOS_DRAG (self), FALSE);
-  g_return_val_if_fail (GDK_IS_MACOS_WINDOW (window), FALSE);
 
-  GDK_BEGIN_MACOS_ALLOC_POOL;
+  _gdk_macos_surface_show (GDK_MACOS_SURFACE (self->drag_surface));
 
-  item = [[GdkMacosPasteboardItem alloc] initForDrag:GDK_DRAG (self) withContentProvider:content];
-  items = [NSArray arrayWithObject:item];
-  nsevent = _gdk_macos_display_get_last_nsevent ();
-
-  session = [[window contentView] beginDraggingSessionWithItems:items
-                                                          event:nsevent
-                                                         source:window];
-
-  GDK_END_MACOS_ALLOC_POOL;
-
-  _gdk_macos_display_set_drag (GDK_MACOS_DISPLAY (gdk_drag_get_display (GDK_DRAG (self))),
-                               [session draggingSequenceNumber],
-                               GDK_DRAG (self));
-
-  return TRUE;
-}
-
-NSDragOperation
-_gdk_macos_drag_operation (GdkMacosDrag *self)
-{
-  NSDragOperation operation = NSDragOperationNone;
-  GdkDragAction actions;
-
-  g_return_val_if_fail (GDK_IS_MACOS_DRAG (self), NSDragOperationNone);
-
-  actions = gdk_drag_get_actions (GDK_DRAG (self));
-
-  if (actions & GDK_ACTION_LINK)
-    operation |= NSDragOperationLink;
-
-  if (actions & GDK_ACTION_MOVE)
-    operation |= NSDragOperationMove;
-
-  if (actions & GDK_ACTION_COPY)
-    operation |= NSDragOperationCopy;
-
-  return operation;
-}
-
-GdkDragAction
-_gdk_macos_drag_ns_operation_to_action (NSDragOperation operation)
-{
-  if (operation & NSDragOperationCopy)
-    return GDK_ACTION_COPY;
-  if (operation & NSDragOperationMove)
-    return GDK_ACTION_MOVE;
-  if (operation & NSDragOperationLink)
-    return GDK_ACTION_LINK;
-  return 0;
-}
-
-void
-_gdk_macos_drag_surface_move (GdkMacosDrag *self,
-                              int           x_root,
-                              int           y_root)
-{
-  g_return_if_fail (GDK_IS_MACOS_DRAG (self));
-
-  self->last_x = x_root;
-  self->last_y = y_root;
-
-  if (GDK_IS_MACOS_SURFACE (self->drag_surface))
-    _gdk_macos_surface_move (GDK_MACOS_SURFACE (self->drag_surface),
-                             x_root - self->hot_x,
-                             y_root - self->hot_y);
-}
-
-void
-_gdk_macos_drag_set_start_position (GdkMacosDrag *self,
-                                    int           start_x,
-                                    int           start_y)
-{
-  g_return_if_fail (GDK_IS_MACOS_DRAG (self));
-
-  self->start_x = start_x;
-  self->start_y = start_y;
-}
-
-void
-_gdk_macos_drag_set_actions (GdkMacosDrag    *self,
-                             GdkModifierType  mods)
-{
-  GdkDragAction suggested_action;
-  GdkDragAction possible_actions;
-
-  g_assert (GDK_IS_MACOS_DRAG (self));
-
-  gdk_drag_get_current_actions (mods,
-                                GDK_BUTTON_PRIMARY,
-                                gdk_drag_get_actions (GDK_DRAG (self)),
-                                &suggested_action,
-                                &possible_actions);
-
-  gdk_drag_set_selected_action (GDK_DRAG (self), suggested_action);
-  gdk_drag_set_actions (GDK_DRAG (self), possible_actions);
+  return drag_grab (self);
 }

gdk/macos/gdkmacoseventsource.c

@@ -37,15 +37,11 @@
 /*
  * This file implementations integration between the GLib main loop and
  * the native system of the Core Foundation run loop and Cocoa event
- * handling. There are basically three different cases that we need to
- * handle:
- *
- * - the GLib main loop is in control. The application has called
- *   gtk_main(), or is otherwise iterating the main loop.
- * - CFRunLoop is in control. We are in a modal operation such as window
- *   resizing.
- * - CFRunLoop is running a nested loop. This happens when a drag-and-drop
- *   operation has been initiated.
+ * handling. There are basically two different cases that we need to
+ * handle: either the GLib main loop is in control (the application
+ * has called gtk_main(), or is otherwise iterating the main loop), or
+ * CFRunLoop is in control (we are in a modal operation such as window
+ * resizing or drag-and-drop.)
  *
  * When the GLib main loop is in control we integrate in native event
  * handling in two ways: first we add a GSource that handles checking
@@ -61,23 +57,14 @@
  * stages of the GLib main loop (prepare, check, dispatch), and make the
  * appropriate calls into GLib.
  *
- * When initiating a drag operation, a nested CFRunLoop is executed.
- * The nested run loop is started when fetching a native event in our GLib
- * main loop. The application does not receive any events until the nested loop
- * is finished. We work around this by forwarding the
- * events that trigger the callbacks of the NSDraggingSource protocol.
- * The "run loop observer" is executing the GLib main loop stages as long as we're
- * in the nested run loop, as if CFRunLoop were in control.
- * See also GdkMacosWindow.
- *
- * All cases share a single problem: the macOS API’s don’t allow us to
+ * Both cases share a single problem: the OS X API’s don’t allow us to
  * wait simultaneously for file descriptors and for events. So when we
  * need to do a blocking wait that includes file descriptor activity, we
  * push the actual work of calling select() to a helper thread (the
  * "select thread") and wait for native events in the main thread.
  *
  * The main known limitation of this code is that if a callback is triggered
- * via the macOS run loop while we are "polling" (in either case described
+ * via the OS X run loop while we are "polling" (in either case described
  * above), iteration of the GLib main loop is not possible from within
  * that callback. If the programmer tries to do so explicitly, then they
  * will get a warning from GLib "main loop already active in another thread".
@@ -653,23 +640,6 @@ _gdk_macos_event_source_get_pending (void)
   return event;
 }
 
-static void
-_gdk_macos_event_source_queue_event (NSEvent *event)
-{
-  /* Just used to wake us up; if an event and a FD arrived at the same
-    * time; could have come from a previous iteration in some cases,
-    * but the spurious wake up is harmless if a little inefficient.
-    */
-  if (!event ||
-      ([event type] == NSEventTypeApplicationDefined &&
-       [event subtype] == GDK_MACOS_EVENT_SUBTYPE_EVENTLOOP))
-    return;
-
-  if (!current_events)
-    current_events = g_queue_new ();
-  g_queue_push_head (current_events, [event retain]);
-}
-
 static gboolean
 gdk_macos_event_source_prepare (GSource *source,
                                 int     *timeout)
@@ -812,7 +782,23 @@ poll_func (GPollFD *ufds,
   if (last_ufds == ufds && n_ready < 0)
     n_ready = select_thread_collect_poll (ufds, nfds);
 
-  _gdk_macos_event_source_queue_event (event);
+  if (event &&
+      [event type] == NSEventTypeApplicationDefined &&
+      [event subtype] == GDK_MACOS_EVENT_SUBTYPE_EVENTLOOP)
+    {
+      /* Just used to wake us up; if an event and a FD arrived at the same
+       * time; could have come from a previous iteration in some cases,
+       * but the spurious wake up is harmless if a little inefficient.
+       */
+      event = NULL;
+    }
+
+  if (event)
+    {
+      if (!current_events)
+        current_events = g_queue_new ();
+      g_queue_push_head (current_events, [event retain]);
+    }
 
   return n_ready;
 }
@@ -1032,10 +1018,7 @@ run_loop_observer_callback (CFRunLoopObserverRef observer,
       break;
     }
 
-  /* DnD starts a nested runloop, or so it seems.
-     If we have such a loop, we still want to run
-     our idle handlers. */
-  if (getting_events > 0 && current_loop_level < 2)
+  if (getting_events > 0) /* Activity we triggered */
     return;
 
   switch (activity)
@@ -1059,6 +1042,7 @@ run_loop_observer_callback (CFRunLoopObserverRef observer,
       run_loop_exit ();
       break;
     case kCFRunLoopAllActivities:
+      /* TODO: Do most of the above? */
     default:
       break;
     }

gdk/macos/gdkmacosglcontext.c

@@ -548,14 +548,6 @@ gdk_macos_gl_context_clear_current (GdkGLContext *context)
   return TRUE;
 }
 
-static gboolean
-gdk_macos_gl_context_is_current (GdkGLContext *context)
-{
-  GdkMacosGLContext *self = GDK_MACOS_GL_CONTEXT (context);
-
-  return self->cgl_context == CGLGetCurrentContext ();
-}
-
 static gboolean
 gdk_macos_gl_context_make_current (GdkGLContext *context,
                                    gboolean      surfaceless)
@@ -647,7 +639,6 @@ gdk_macos_gl_context_class_init (GdkMacosGLContextClass *klass)
 
   gl_class->get_damage = gdk_macos_gl_context_get_damage;
   gl_class->clear_current = gdk_macos_gl_context_clear_current;
-  gl_class->is_current = gdk_macos_gl_context_is_current;
   gl_class->make_current = gdk_macos_gl_context_make_current;
   gl_class->realize = gdk_macos_gl_context_real_realize;
   gl_class->get_default_framebuffer = gdk_macos_gl_context_get_default_framebuffer;

gdk/macos/gdkmacospasteboard-private.h

@@ -1,74 +0,0 @@
-/*
- * Copyright © 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#ifndef __GDK_MACOS_PASTEBOARD_PRIVATE_H__
-#define __GDK_MACOS_PASTEBOARD_PRIVATE_H__
-
-#include <AppKit/AppKit.h>
-#include <gio/gio.h>
-
-#include "gdkclipboardprivate.h"
-
-G_BEGIN_DECLS
-
-@interface GdkMacosPasteboardItemDataProvider : NSObject <NSPasteboardItemDataProvider>
-{
-  GdkContentProvider *_contentProvider;
-  GdkClipboard *_clipboard;
-  GdkDrag *_drag;
-}
-
--(id)initForClipboard:(GdkClipboard *)clipboard withContentProvider:(GdkContentProvider *)contentProvider;
--(id)initForDrag:(GdkDrag *)drag withContentProvider:(GdkContentProvider *)contentProvider;
-
-@end
-
-@interface GdkMacosPasteboardItem : NSPasteboardItem
-{
-  GdkContentProvider *_contentProvider;
-  GdkClipboard *_clipboard;
-  GdkDrag *_drag;
-  NSRect _draggingFrame;
-}
-
--(id)initForClipboard:(GdkClipboard *)clipboard withContentProvider:(GdkContentProvider *)contentProvider;
--(id)initForDrag:(GdkDrag *)drag withContentProvider:(GdkContentProvider *)contentProvider;
-
-@end
-
-NSPasteboardType   _gdk_macos_pasteboard_to_ns_type          (const char                      *mime_type,
-                                                              NSPasteboardType                *alternate);
-const char        *_gdk_macos_pasteboard_from_ns_type        (NSPasteboardType                 type);
-GdkContentFormats *_gdk_macos_pasteboard_load_formats        (NSPasteboard                    *pasteboard);
-void               _gdk_macos_pasteboard_register_drag_types (NSWindow                        *window);
-void               _gdk_macos_pasteboard_read_async          (GObject                         *object,
-                                                              NSPasteboard                    *pasteboard,
-                                                              GdkContentFormats               *formats,
-                                                              int                              io_priority,
-                                                              GCancellable                    *cancellable,
-                                                              GAsyncReadyCallback              callback,
-                                                              gpointer                         user_data);
-GInputStream      *_gdk_macos_pasteboard_read_finish         (GObject                         *object,
-                                                              GAsyncResult                    *result,
-                                                              const char                     **out_mime_type,
-                                                              GError                         **error);
-
-G_END_DECLS
-
-#endif /* __GDK_MACOS_PASTEBOARD_PRIVATE_H__ */

gdk/macos/gdkmacospasteboard.c

@@ -1,602 +0,0 @@
-/*
- * Copyright © 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include "config.h"
-
-#include <glib/gi18n.h>
-
-#include "gdkdragprivate.h"
-#include "gdkmacospasteboard-private.h"
-#include "gdkmacosutils-private.h"
-
-enum {
-  TYPE_STRING,
-  TYPE_PBOARD,
-  TYPE_URL,
-  TYPE_FILE_URL,
-  TYPE_COLOR,
-  TYPE_TIFF,
-  TYPE_PNG,
-  TYPE_LAST
-};
-
-#define PTYPE(k) (get_pasteboard_type(TYPE_##k))
-
-static NSPasteboardType pasteboard_types[TYPE_LAST];
-
-static NSPasteboardType
-get_pasteboard_type (int type)
-{
-  static gsize initialized = FALSE;
-
-  g_assert (type >= 0);
-  g_assert (type < TYPE_LAST);
-
-  if (g_once_init_enter (&initialized))
-    {
-      pasteboard_types[TYPE_PNG] = NSPasteboardTypePNG;
-      pasteboard_types[TYPE_STRING] = NSPasteboardTypeString;
-      pasteboard_types[TYPE_TIFF] = NSPasteboardTypeTIFF;
-      pasteboard_types[TYPE_COLOR] = NSPasteboardTypeColor;
-
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      pasteboard_types[TYPE_PBOARD] = NSStringPboardType;
-      G_GNUC_END_IGNORE_DEPRECATIONS
-
-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER
-      pasteboard_types[TYPE_URL] = NSPasteboardTypeURL;
-      pasteboard_types[TYPE_FILE_URL] = NSPasteboardTypeFileURL;
-#else
-      pasteboard_types[TYPE_URL] = [[NSString alloc] initWithUTF8String:"public.url"];
-      pasteboard_types[TYPE_FILE_URL] = [[NSString alloc] initWithUTF8String:"public.file-url"];
-#endif
-
-      g_once_init_leave (&initialized, TRUE);
-    }
-
-  return pasteboard_types[type];
-}
-
-const char *
-_gdk_macos_pasteboard_from_ns_type (NSPasteboardType type)
-{
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  if ([type isEqualToString:PTYPE(STRING)] ||
-      [type isEqualToString:PTYPE(PBOARD)])
-    return g_intern_string ("text/plain;charset=utf-8");
-  else if ([type isEqualToString:PTYPE(URL)] ||
-           [type isEqualToString:PTYPE(FILE_URL)])
-    return g_intern_string ("text/uri-list");
-  else if ([type isEqualToString:PTYPE(COLOR)])
-    return g_intern_string ("application/x-color");
-  else if ([type isEqualToString:PTYPE(TIFF)])
-    return g_intern_string ("image/tiff");
-  else if ([type isEqualToString:PTYPE(PNG)])
-    return g_intern_string ("image/png");
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return NULL;
-}
-
-NSPasteboardType
-_gdk_macos_pasteboard_to_ns_type (const char       *mime_type,
-                                  NSPasteboardType *alternate)
-{
-  if (alternate)
-    *alternate = NULL;
-
-  if (g_strcmp0 (mime_type, "text/plain;charset=utf-8") == 0)
-    {
-      return PTYPE(STRING);
-    }
-  else if (g_strcmp0 (mime_type, "text/uri-list") == 0)
-    {
-      if (alternate)
-        *alternate = PTYPE(URL);
-      return PTYPE(FILE_URL);
-    }
-  else if (g_strcmp0 (mime_type, "application/x-color") == 0)
-    {
-      return PTYPE(COLOR);
-    }
-  else if (g_strcmp0 (mime_type, "image/tiff") == 0)
-    {
-      return PTYPE(TIFF);
-    }
-  else if (g_strcmp0 (mime_type, "image/png") == 0)
-    {
-      return PTYPE(PNG);
-    }
-
-  return nil;
-}
-
-static void
-populate_content_formats (GdkContentFormatsBuilder *builder,
-                          NSPasteboardType          type)
-{
-  const char *mime_type;
-
-  g_assert (builder != NULL);
-  g_assert (type != NULL);
-
-  if ((mime_type = _gdk_macos_pasteboard_from_ns_type (type)))
-    gdk_content_formats_builder_add_mime_type (builder, mime_type);
-}
-
-static GdkContentFormats *
-load_offer_formats (NSPasteboard *pasteboard)
-{
-  GDK_BEGIN_MACOS_ALLOC_POOL;
-
-  GdkContentFormatsBuilder *builder;
-  GdkContentFormats *formats;
-
-  builder = gdk_content_formats_builder_new ();
-  for (NSPasteboardType type in [pasteboard types])
-    populate_content_formats (builder, type);
-  formats = gdk_content_formats_builder_free_to_formats (builder);
-
-  GDK_END_MACOS_ALLOC_POOL;
-
-  return g_steal_pointer (&formats);
-}
-
-GdkContentFormats *
-_gdk_macos_pasteboard_load_formats (NSPasteboard *pasteboard)
-{
-  return load_offer_formats (pasteboard);
-}
-
-static GInputStream *
-create_stream_from_nsdata (NSData *data)
-{
-  const guint8 *bytes = [data bytes];
-  gsize len = [data length];
-
-  return g_memory_input_stream_new_from_data (g_memdup2 (bytes, len), len, g_free);
-}
-
-void
-_gdk_macos_pasteboard_read_async (GObject             *object,
-                                  NSPasteboard        *pasteboard,
-                                  GdkContentFormats   *formats,
-                                  int                  io_priority,
-                                  GCancellable        *cancellable,
-                                  GAsyncReadyCallback  callback,
-                                  gpointer             user_data)
-{
-  GDK_BEGIN_MACOS_ALLOC_POOL;
-
-  GdkContentFormats *offer_formats = NULL;
-  const char *mime_type;
-  GInputStream *stream = NULL;
-  GTask *task = NULL;
-
-  g_assert (G_IS_OBJECT (object));
-  g_assert (pasteboard != NULL);
-  g_assert (formats != NULL);
-
-  task = g_task_new (object, cancellable, callback, user_data);
-  g_task_set_source_tag (task, _gdk_macos_pasteboard_read_async);
-  g_task_set_priority (task, io_priority);
-
-  offer_formats = load_offer_formats (pasteboard);
-  mime_type = gdk_content_formats_match_mime_type (formats, offer_formats);
-
-  if (mime_type == NULL)
-    {
-      g_task_return_new_error (task,
-                               G_IO_ERROR,
-                               G_IO_ERROR_NOT_SUPPORTED,
-                               "%s",
-                               _("No compatible transfer format found"));
-      goto cleanup;
-    }
-
-  if (strcmp (mime_type, "text/plain;charset=utf-8") == 0)
-    {
-      NSString *nsstr = [pasteboard stringForType:NSPasteboardTypeString];
-
-      if (nsstr != NULL)
-        {
-          const char *str = [nsstr UTF8String];
-          stream = g_memory_input_stream_new_from_data (g_strdup (str),
-                                                        strlen (str) + 1,
-                                                        g_free);
-        }
-    }
-  else if (strcmp (mime_type, "text/uri-list") == 0)
-    {
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-      if ([[pasteboard types] containsObject:PTYPE(FILE_URL)])
-        {
-          GString *str = g_string_new (NULL);
-          NSArray *files = [pasteboard propertyListForType:NSFilenamesPboardType];
-          gsize n_files = [files count];
-          char *data;
-          guint len;
-
-          for (gsize i = 0; i < n_files; ++i)
-            {
-              NSString* uriString = [files objectAtIndex:i];
-              uriString = [@"file://" stringByAppendingString:uriString];
-              uriString = [uriString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-
-              g_string_append_printf (str,
-                                      "%s\r\n",
-                                      [uriString cStringUsingEncoding:NSUTF8StringEncoding]);
-            }
-
-          len = str->len;
-          data = g_string_free (str, FALSE);
-          stream = g_memory_input_stream_new_from_data (data, len, g_free);
-        }
-
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-    }
-  else if (strcmp (mime_type, "application/x-color") == 0)
-    {
-      NSColorSpace *colorspace;
-      NSColor *nscolor;
-      guint16 color[4];
-
-      colorspace = [NSColorSpace genericRGBColorSpace];
-      nscolor = [[NSColor colorFromPasteboard:pasteboard]
-                    colorUsingColorSpace:colorspace];
-
-      color[0] = 0xffff * [nscolor redComponent];
-      color[1] = 0xffff * [nscolor greenComponent];
-      color[2] = 0xffff * [nscolor blueComponent];
-      color[3] = 0xffff * [nscolor alphaComponent];
-
-      stream = g_memory_input_stream_new_from_data (g_memdup2 (&color, sizeof color),
-                                                    sizeof color,
-                                                    g_free);
-    }
-  else if (strcmp (mime_type, "image/tiff") == 0)
-    {
-      NSData *data = [pasteboard dataForType:PTYPE(TIFF)];
-      stream = create_stream_from_nsdata (data);
-    }
-  else if (strcmp (mime_type, "image/png") == 0)
-    {
-      NSData *data = [pasteboard dataForType:PTYPE(PNG)];
-      stream = create_stream_from_nsdata (data);
-    }
-
-  if (stream != NULL)
-    {
-      g_task_set_task_data (task, g_strdup (mime_type), g_free);
-      g_task_return_pointer (task, g_steal_pointer (&stream), g_object_unref);
-    }
-  else
-    {
-      g_task_return_new_error (task,
-                               G_IO_ERROR,
-                               G_IO_ERROR_FAILED,
-                               _("Failed to decode contents with mime-type of '%s'"),
-                               mime_type);
-    }
-
-cleanup:
-  g_clear_object (&task);
-  g_clear_pointer (&offer_formats, gdk_content_formats_unref);
-
-  GDK_END_MACOS_ALLOC_POOL;
-}
-
-GInputStream *
-_gdk_macos_pasteboard_read_finish (GObject       *object,
-                                   GAsyncResult  *result,
-                                   const char   **out_mime_type,
-                                   GError       **error)
-{
-  GTask *task = (GTask *)result;
-
-  g_assert (G_IS_OBJECT (object));
-  g_assert (G_IS_TASK (task));
-
-  if (out_mime_type != NULL)
-    *out_mime_type = g_strdup (g_task_get_task_data (task));
-
-  return g_task_propagate_pointer (task, error);
-}
-
-void
-_gdk_macos_pasteboard_register_drag_types (NSWindow *window)
-{
-  [window registerForDraggedTypes:[NSArray arrayWithObjects:PTYPE(STRING),
-                                                            PTYPE(PBOARD),
-                                                            PTYPE(URL),
-                                                            PTYPE(FILE_URL),
-                                                            PTYPE(COLOR),
-                                                            PTYPE(TIFF),
-                                                            PTYPE(PNG),
-                                                            nil]];
-}
-
-@implementation GdkMacosPasteboardItemDataProvider
-
--(id)initForClipboard:(GdkClipboard*)clipboard withContentProvider:(GdkContentProvider*)contentProvider
-{
-  [super init];
-  g_set_object (&self->_clipboard, clipboard);
-  g_set_object (&self->_contentProvider, contentProvider);
-  return self;
-}
-
--(id)initForDrag:(GdkDrag*)drag withContentProvider:(GdkContentProvider*)contentProvider
-{
-  [super init];
-  g_set_object (&self->_drag, drag);
-  g_set_object (&self->_contentProvider, contentProvider);
-  return self;
-}
-
--(void)dealloc
-{
-  g_clear_object (&self->_contentProvider);
-  g_clear_object (&self->_clipboard);
-  g_clear_object (&self->_drag);
-  [super dealloc];
-}
-
--(NSArray<NSPasteboardType> *)types
-{
-  NSMutableArray *ret = [[NSMutableArray alloc] init];
-  GdkContentFormats *serializable;
-  const char * const *mime_types;
-  gsize n_mime_types;
-
-  serializable = gdk_content_provider_ref_storable_formats (self->_contentProvider);
-  serializable = gdk_content_formats_union_serialize_mime_types (serializable);
-  mime_types = gdk_content_formats_get_mime_types (serializable, &n_mime_types);
-
-  for (gsize i = 0; i < n_mime_types; i++)
-    {
-      const char *mime_type = mime_types[i];
-      NSPasteboardType type;
-      NSPasteboardType alternate = nil;
-
-      if ((type = _gdk_macos_pasteboard_to_ns_type (mime_type, &alternate)))
-        {
-          [ret addObject:type];
-          if (alternate)
-            [ret addObject:alternate];
-        }
-    }
-
-  gdk_content_formats_unref (serializable);
-
-  /* Default to an url type (think gobject://internal)
-   * to support internal, GType-based DnD.
-   */
-  if (n_mime_types == 0)
-    {
-      GdkContentFormats *formats;
-      gsize n_gtypes;
-
-      formats = gdk_content_provider_ref_formats (self->_contentProvider);
-      gdk_content_formats_get_gtypes (formats, &n_gtypes);
-
-      if (n_gtypes)
-        [ret addObject:NSPasteboardTypeURL];
-
-      gdk_content_formats_unref (formats);
-    }
-
-  return g_steal_pointer (&ret);
-}
-
-typedef struct
-{
-  GMemoryOutputStream *stream;
-  NSPasteboardItem    *item;
-  NSPasteboardType     type;
-  GMainContext        *main_context;
-  guint                done : 1;
-} WriteRequest;
-
-static void
-write_request_free (WriteRequest *wr)
-{
-  g_clear_pointer (&wr->main_context, g_main_context_unref);
-  g_clear_object (&wr->stream);
-  [wr->item release];
-  g_slice_free (WriteRequest, wr);
-}
-
-static void
-on_data_ready_cb (GObject      *object,
-                  GAsyncResult *result,
-                  gpointer      user_data)
-{
-  GDK_BEGIN_MACOS_ALLOC_POOL;
-
-  WriteRequest *wr = user_data;
-  GError *error = NULL;
-  NSData *data = nil;
-  gboolean ret;
-
-  g_assert (G_IS_OBJECT (object));
-  g_assert (GDK_IS_CLIPBOARD (object) || GDK_IS_DRAG (object));
-  g_assert (G_IS_ASYNC_RESULT (result));
-  g_assert (wr != NULL);
-  g_assert (G_IS_MEMORY_OUTPUT_STREAM (wr->stream));
-  g_assert ([wr->item isKindOfClass:[NSPasteboardItem class]]);
-
-  if (GDK_IS_CLIPBOARD (object))
-    ret = gdk_clipboard_write_finish (GDK_CLIPBOARD (object), result, &error);
-  else if (GDK_IS_DRAG (object))
-    ret = gdk_drag_write_finish (GDK_DRAG (object), result, &error);
-  else
-    g_return_if_reached ();
-
-  if (ret)
-    {
-      gsize size;
-      gpointer bytes;
-
-      g_output_stream_close (G_OUTPUT_STREAM (wr->stream), NULL, NULL);
-
-      size = g_memory_output_stream_get_data_size (wr->stream);
-      bytes = g_memory_output_stream_steal_data (wr->stream);
-      data = [[NSData alloc] initWithBytesNoCopy:bytes
-                                          length:size
-                                     deallocator:^(void *alloc, NSUInteger length) { g_free (alloc); }];
-    }
-  else
-    {
-      g_warning ("Failed to serialize pasteboard contents: %s",
-                 error->message);
-      g_clear_error (&error);
-    }
-
-  [wr->item setData:data forType:wr->type];
-
-  wr->done = TRUE;
-
-  GDK_END_MACOS_ALLOC_POOL;
-}
-
--(void)pasteboard:(NSPasteboard *)pasteboard item:(NSPasteboardItem *)item provideDataForType:(NSPasteboardType)type
-{
-  const char *mime_type = _gdk_macos_pasteboard_from_ns_type (type);
-  GMainContext *main_context = g_main_context_default ();
-  WriteRequest *wr;
-
-  if (self->_contentProvider == NULL || mime_type == NULL)
-    {
-      [item setData:[NSData data] forType:type];
-      return;
-    }
-
-  wr = g_slice_new0 (WriteRequest);
-  wr->item = [item retain];
-  wr->stream = G_MEMORY_OUTPUT_STREAM (g_memory_output_stream_new_resizable ());
-  wr->type = type;
-  wr->main_context = g_main_context_ref (main_context);
-  wr->done = FALSE;
-
-  if (GDK_IS_CLIPBOARD (self->_clipboard))
-    gdk_clipboard_write_async (self->_clipboard,
-                               mime_type,
-                               G_OUTPUT_STREAM (wr->stream),
-                               G_PRIORITY_DEFAULT,
-                               NULL,
-                               on_data_ready_cb,
-                               wr);
-  else if (GDK_IS_DRAG (self->_drag))
-    gdk_drag_write_async (self->_drag,
-                          mime_type,
-                          G_OUTPUT_STREAM (wr->stream),
-                          G_PRIORITY_DEFAULT,
-                          NULL,
-                          on_data_ready_cb,
-                          wr);
-  else
-    g_return_if_reached ();
-
-  /* We're forced to provide data synchronously via this API
-   * so we must block on the main loop. Using another main loop
-   * than the default tends to get us locked up here, so that is
-   * what we'll do for now.
-   */
-  while (!wr->done)
-    g_main_context_iteration (wr->main_context, TRUE);
-
-  write_request_free (wr);
-}
-
--(void)pasteboardFinishedWithDataProvider:(NSPasteboard *)pasteboard
-{
-  g_clear_object (&self->_clipboard);
-  g_clear_object (&self->_drag);
-  g_clear_object (&self->_contentProvider);
-}
-
-@end
-
-@implementation GdkMacosPasteboardItem
-
--(id)initForClipboard:(GdkClipboard*)clipboard withContentProvider:(GdkContentProvider*)contentProvider
-{
-  GdkMacosPasteboardItemDataProvider *dataProvider;
-
-  dataProvider = [[GdkMacosPasteboardItemDataProvider alloc] initForClipboard:clipboard withContentProvider:contentProvider];
-
-  [super init];
-  g_set_object (&self->_clipboard, clipboard);
-  g_set_object (&self->_contentProvider, contentProvider);
-  [self setDataProvider:dataProvider forTypes:[dataProvider types]];
-
-  [dataProvider release];
-
-  return self;
-}
-
--(id)initForDrag:(GdkDrag*)drag withContentProvider:(GdkContentProvider*)contentProvider
-{
-  GdkMacosPasteboardItemDataProvider *dataProvider;
-
-  dataProvider = [[GdkMacosPasteboardItemDataProvider alloc] initForDrag:drag withContentProvider:contentProvider];
-
-  [super init];
-  g_set_object (&self->_drag, drag);
-  g_set_object (&self->_contentProvider, contentProvider);
-  [self setDataProvider:dataProvider forTypes:[dataProvider types]];
-
-  [dataProvider release];
-
-  return self;
-}
-
--(void)dealloc
-{
-  g_clear_object (&self->_contentProvider);
-  g_clear_object (&self->_clipboard);
-  g_clear_object (&self->_drag);
-  [super dealloc];
-}
-
--(NSRect)draggingFrame
-{
-  return self->_draggingFrame;
-}
-
--(void)setDraggingFrame:(NSRect)draggingFrame;
-{
-  self->_draggingFrame = draggingFrame;
-}
-
--(id)item
-{
-  return self;
-}
-
--(NSArray* (^) (void))imageComponentsProvider
-{
-  return nil;
-}
-
-@end

gdk/macos/gdkmacossurface.c

@@ -446,7 +446,7 @@ gdk_macos_surface_drag_begin (GdkSurface         *surface,
                                 gdk_drag_get_selected_action (GDK_DRAG (drag)));
   gdk_drag_set_cursor (GDK_DRAG (drag), cursor);
 
-  if (!_gdk_macos_drag_begin (drag, content, self->window))
+  if (!_gdk_macos_drag_begin (drag))
     {
       g_object_unref (drag);
       return NULL;

gdk/macos/meson.build

@@ -19,7 +19,6 @@ gdk_macos_sources = files([
   'gdkmacoseventsource.c',
   'gdkmacoskeymap.c',
   'gdkmacosmonitor.c',
-  'gdkmacospasteboard.c',
   'gdkmacospopupsurface.c',
   'gdkmacosseat.c',
   'gdkmacossurface.c',

gdk/wayland/gdkdevice-wayland-private.h

@@ -2,236 +2,6 @@
 #define __GDK_DEVICE_WAYLAND_PRIVATE_H__
 
 #include "gdkwaylanddevice.h"
-#include "gdkwaylandseat.h"
-
-#include <gdk/gdkdeviceprivate.h>
-#include <gdk/gdkkeysprivate.h>
-
-#include <xkbcommon/xkbcommon.h>
-
-struct _GdkWaylandDevice
-{
-  GdkDevice parent_instance;
-};
-
-struct _GdkWaylandDeviceClass
-{
-  GdkDeviceClass parent_class;
-};
-
-typedef struct _GdkWaylandTouchData GdkWaylandTouchData;
-typedef struct _GdkWaylandPointerFrameData GdkWaylandPointerFrameData;
-typedef struct _GdkWaylandPointerData GdkWaylandPointerData;
-typedef struct _GdkWaylandTabletPadGroupData GdkWaylandTabletPadGroupData;
-typedef struct _GdkWaylandTabletPadData GdkWaylandTabletPadData;
-typedef struct _GdkWaylandTabletData GdkWaylandTabletData;
-typedef struct _GdkWaylandTabletToolData GdkWaylandTabletToolData;
-
-struct _GdkWaylandTouchData
-{
-  uint32_t id;
-  double x;
-  double y;
-  GdkSurface *surface;
-  uint32_t touch_down_serial;
-  guint initial_touch : 1;
-};
-
-struct _GdkWaylandPointerFrameData
-{
-  GdkEvent *event;
-
-  /* Specific to the scroll event */
-  double delta_x, delta_y;
-  int32_t value120_x, value120_y;
-  gint8 is_scroll_stop;
-  enum wl_pointer_axis_source source;
-};
-
-struct _GdkWaylandPointerData {
-  GdkSurface *focus;
-
-  double surface_x, surface_y;
-
-  GdkModifierType button_modifiers;
-
-  uint32_t time;
-  uint32_t enter_serial;
-  uint32_t press_serial;
-
-  GdkSurface *grab_surface;
-  uint32_t grab_time;
-
-  struct wl_surface *pointer_surface;
-  guint cursor_is_default: 1;
-  GdkCursor *cursor;
-  guint cursor_timeout_id;
-  guint cursor_image_index;
-  guint cursor_image_delay;
-  guint touchpad_event_sequence;
-
-  guint current_output_scale;
-  GSList *pointer_surface_outputs;
-
-  /* Accumulated event data for a pointer frame */
-  GdkWaylandPointerFrameData frame;
-};
-
-struct _GdkWaylandTabletPadGroupData
-{
-  GdkWaylandTabletPadData *pad;
-  struct zwp_tablet_pad_group_v2 *wp_tablet_pad_group;
-  GList *rings;
-  GList *strips;
-  GList *buttons;
-
-  guint mode_switch_serial;
-  guint n_modes;
-  guint current_mode;
-
-  struct {
-    guint source;
-    gboolean is_stop;
-    double value;
-  } axis_tmp_info;
-};
-
-struct _GdkWaylandTabletPadData
-{
-  GdkSeat *seat;
-  struct zwp_tablet_pad_v2 *wp_tablet_pad;
-  GdkDevice *device;
-
-  GdkWaylandTabletData *current_tablet;
-
-  guint enter_serial;
-  uint32_t n_buttons;
-  char *path;
-
-  GList *rings;
-  GList *strips;
-  GList *mode_groups;
-};
-
-struct _GdkWaylandTabletToolData
-{
-  GdkSeat *seat;
-  struct zwp_tablet_tool_v2 *wp_tablet_tool;
-  GdkAxisFlags axes;
-  GdkDeviceToolType type;
-  guint64 hardware_serial;
-  guint64 hardware_id_wacom;
-
-  GdkDeviceTool *tool;
-  GdkWaylandTabletData *current_tablet;
-};
-
-struct _GdkWaylandTabletData
-{
-  struct zwp_tablet_v2 *wp_tablet;
-  char *name;
-  char *path;
-  uint32_t vid;
-  uint32_t pid;
-
-  GdkDevice *logical_device;
-  GdkDevice *stylus_device;
-  GdkSeat *seat;
-  GdkWaylandPointerData pointer_info;
-
-  GList *pads;
-
-  GdkWaylandTabletToolData *current_tool;
-
-  int axis_indices[GDK_AXIS_LAST];
-  double axes[GDK_AXIS_LAST];
-};
-
-struct _GdkWaylandSeat
-{
-  GdkSeat parent_instance;
-
-  guint32 id;
-  struct wl_seat *wl_seat;
-  struct wl_pointer *wl_pointer;
-  struct wl_keyboard *wl_keyboard;
-  struct wl_touch *wl_touch;
-  struct zwp_pointer_gesture_swipe_v1 *wp_pointer_gesture_swipe;
-  struct zwp_pointer_gesture_pinch_v1 *wp_pointer_gesture_pinch;
-  struct zwp_pointer_gesture_hold_v1 *wp_pointer_gesture_hold;
-  struct zwp_tablet_seat_v2 *wp_tablet_seat;
-
-  GdkDisplay *display;
-
-  GdkDevice *logical_pointer;
-  GdkDevice *logical_keyboard;
-  GdkDevice *pointer;
-  GdkDevice *wheel_scrolling;
-  GdkDevice *finger_scrolling;
-  GdkDevice *continuous_scrolling;
-  GdkDevice *keyboard;
-  GdkDevice *logical_touch;
-  GdkDevice *touch;
-  GdkCursor *cursor;
-  GdkKeymap *keymap;
-
-  GHashTable *touches;
-  GList *tablets;
-  GList *tablet_tools;
-  GList *tablet_pads;
-
-  GdkWaylandPointerData pointer_info;
-  GdkWaylandPointerData touch_info;
-
-  GdkModifierType key_modifiers;
-  GdkSurface *keyboard_focus;
-  GdkSurface *grab_surface;
-  uint32_t grab_time;
-  gboolean have_server_repeat;
-  uint32_t server_repeat_rate;
-  uint32_t server_repeat_delay;
-
-  struct wl_data_offer *pending_offer;
-  GdkContentFormatsBuilder *pending_builder;
-  GdkDragAction pending_source_actions;
-  GdkDragAction pending_action;
-
-  struct wl_callback *repeat_callback;
-  guint32 repeat_timer;
-  guint32 repeat_key;
-  guint32 repeat_count;
-  gint64 repeat_deadline;
-  uint32_t keyboard_time;
-  uint32_t keyboard_key_serial;
-
-  GdkClipboard *clipboard;
-  GdkClipboard *primary_clipboard;
-  struct wl_data_device *data_device;
-  GdkDrag *drag;
-  GdkDrop *drop;
-
-  /* Some tracking on gesture events */
-  guint gesture_n_fingers;
-  double gesture_scale;
-
-  GdkCursor *grab_cursor;
-};
-
-#define GDK_TYPE_WAYLAND_DEVICE_PAD (gdk_wayland_device_pad_get_type ())
-GType gdk_wayland_device_pad_get_type (void);
-
-void gdk_wayland_seat_stop_cursor_animation (GdkWaylandSeat        *seat,
-                                             GdkWaylandPointerData *pointer);
-
-GdkWaylandPointerData * gdk_wayland_device_get_pointer (GdkWaylandDevice *wayland_device);
-
-void gdk_wayland_device_set_pointer (GdkWaylandDevice      *wayland_device,
-                                     GdkWaylandPointerData *pointer);
-
-GdkWaylandTouchData * gdk_wayland_device_get_emulating_touch (GdkWaylandDevice *wayland_device);
-
-void gdk_wayland_device_set_emulating_touch (GdkWaylandDevice    *wayland_device,
-                                             GdkWaylandTouchData *touch);
 
 void gdk_wayland_device_query_state (GdkDevice        *device,
                                      GdkSurface       *surface,
@@ -244,24 +14,4 @@ void gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
                                           guint                feature_idx,
                                           const char          *label);
 
-GdkWaylandTabletPadData * gdk_wayland_seat_find_pad (GdkWaylandSeat *seat,
-                                                     GdkDevice      *device);
-
-GdkWaylandTabletData * gdk_wayland_seat_find_tablet (GdkWaylandSeat *seat,
-                                                     GdkDevice      *device);
-
-GdkWaylandTouchData * gdk_wayland_seat_get_touch (GdkWaylandSeat *seat,
-                                                  uint32_t        id);
-
-void gdk_wayland_device_maybe_emit_grab_crossing (GdkDevice  *device,
-                                                  GdkSurface *window,
-                                                  guint32     time);
-
-GdkSurface * gdk_wayland_device_maybe_emit_ungrab_crossing (GdkDevice *device,
-                                                            guint32    time_);
-
-gboolean gdk_wayland_device_update_surface_cursor (GdkDevice *device);
-
-GdkModifierType gdk_wayland_device_get_modifiers (GdkDevice *device);
-
 #endif

gdk/wayland/gdkdevicepad-wayland.c

@@ -1,266 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2009 Carlos Garnacho <carlosg@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdkwaylanddevice.h"
-#include "gdkdevice-wayland-private.h"
-
-#include "tablet-unstable-v2-client-protocol.h"
-
-#include <gdk/gdkdevicepadprivate.h>
-
-typedef struct _GdkWaylandDevicePad GdkWaylandDevicePad;
-typedef struct _GdkWaylandDevicePadClass GdkWaylandDevicePadClass;
-
-struct _GdkWaylandDevicePad
-{
-  GdkWaylandDevice parent_instance;
-};
-
-struct _GdkWaylandDevicePadClass
-{
-  GdkWaylandDeviceClass parent_class;
-};
-
-static void gdk_wayland_device_pad_iface_init (GdkDevicePadInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GdkWaylandDevicePad, gdk_wayland_device_pad,
-                         GDK_TYPE_WAYLAND_DEVICE,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_DEVICE_PAD,
-                                                gdk_wayland_device_pad_iface_init))
-
-static int
-gdk_wayland_device_pad_get_n_groups (GdkDevicePad *pad)
-{
-  GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad));
-  GdkWaylandTabletPadData *data;
-
-  data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat),
-                                    GDK_DEVICE (pad));
-#ifdef G_DISABLE_ASSERT
-  if (data == NULL)
-    return 0;
-#else
-  g_assert (data != NULL);
-#endif
-
-  return g_list_length (data->mode_groups);
-}
-
-static int
-gdk_wayland_device_pad_get_group_n_modes (GdkDevicePad *pad,
-                                          int           n_group)
-{
-  GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad));
-  GdkWaylandTabletPadGroupData *group;
-  GdkWaylandTabletPadData *data;
-
-  data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat),
-                                    GDK_DEVICE (pad));
-#ifdef G_DISABLE_ASSERT
-  if (data == NULL)
-    return 0;
-#else
-  g_assert (data != NULL);
-#endif
-
-  group = g_list_nth_data (data->mode_groups, n_group);
-  if (!group)
-    return -1;
-
-  return group->n_modes;
-}
-
-static int
-gdk_wayland_device_pad_get_n_features (GdkDevicePad        *pad,
-                                       GdkDevicePadFeature  feature)
-{
-  GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad));
-  GdkWaylandTabletPadData *data;
-
-  data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat),
-                                    GDK_DEVICE (pad));
-  g_assert (data != NULL);
-
-  switch (feature)
-    {
-    case GDK_DEVICE_PAD_FEATURE_BUTTON:
-      return data->n_buttons;
-    case GDK_DEVICE_PAD_FEATURE_RING:
-      return g_list_length (data->rings);
-    case GDK_DEVICE_PAD_FEATURE_STRIP:
-      return g_list_length (data->strips);
-    default:
-      return -1;
-    }
-}
-
-static int
-gdk_wayland_device_pad_get_feature_group (GdkDevicePad        *pad,
-                                          GdkDevicePadFeature  feature,
-                                          int                  idx)
-{
-  GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad));
-  GdkWaylandTabletPadGroupData *group;
-  GdkWaylandTabletPadData *data;
-  GList *l;
-  int i;
-
-  data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat),
-                                    GDK_DEVICE (pad));
-#ifdef G_DISABLE_ASSERT
-  if (data == NULL)
-    return -1;
-#else
-  g_assert (data != NULL);
-#endif
-
-  for (l = data->mode_groups, i = 0; l; l = l->next, i++)
-    {
-      group = l->data;
-
-      switch (feature)
-        {
-        case GDK_DEVICE_PAD_FEATURE_BUTTON:
-          if (g_list_find (group->buttons, GINT_TO_POINTER (idx)))
-            return i;
-          break;
-        case GDK_DEVICE_PAD_FEATURE_RING:
-          {
-            gpointer ring;
-
-            ring = g_list_nth_data (data->rings, idx);
-            if (ring && g_list_find (group->rings, ring))
-              return i;
-            break;
-          }
-        case GDK_DEVICE_PAD_FEATURE_STRIP:
-          {
-            gpointer strip;
-            strip = g_list_nth_data (data->strips, idx);
-            if (strip && g_list_find (group->strips, strip))
-              return i;
-            break;
-          }
-        default:
-          break;
-        }
-    }
-
-  return -1;
-}
-
-static void
-gdk_wayland_device_pad_iface_init (GdkDevicePadInterface *iface)
-{
-  iface->get_n_groups = gdk_wayland_device_pad_get_n_groups;
-  iface->get_group_n_modes = gdk_wayland_device_pad_get_group_n_modes;
-  iface->get_n_features = gdk_wayland_device_pad_get_n_features;
-  iface->get_feature_group = gdk_wayland_device_pad_get_feature_group;
-}
-
-static void
-gdk_wayland_device_pad_class_init (GdkWaylandDevicePadClass *klass)
-{
-}
-
-static void
-gdk_wayland_device_pad_init (GdkWaylandDevicePad *pad)
-{
-}
-
-static GdkWaylandTabletPadGroupData *
-tablet_pad_lookup_button_group (GdkWaylandTabletPadData *pad,
-                                uint32_t                 button)
-{
-  GdkWaylandTabletPadGroupData *group;
-  GList *l;
-
-  for (l = pad->mode_groups; l; l = l->next)
-    {
-      group = l->data;
-
-      if (g_list_find (group->buttons, GUINT_TO_POINTER (button)))
-        return group;
-    }
-
-  return NULL;
-}
-
-/*<private>
- * gdk_wayland_device_pad_set_feedback:
- * @device: (type GdkWaylandDevice): a %GDK_SOURCE_TABLET_PAD device
- * @feature: Feature to set the feedback label for
- * @feature_idx: 0-indexed index of the feature to set the feedback label for
- * @label: Feedback label
- *
- * Sets the feedback label for the given feature/index.
- *
- * This may be used by the compositor to provide user feedback
- * of the actions available/performed.
- */
-void
-gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
-                                     GdkDevicePadFeature  feature,
-                                     guint                feature_idx,
-                                     const char          *label)
-{
-  GdkWaylandTabletPadData *pad;
-  GdkWaylandTabletPadGroupData *group;
-  GdkSeat *seat;
-
-  seat = gdk_device_get_seat (device);
-  pad = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat), device);
-  if (!pad)
-    return;
-
-  if (feature == GDK_DEVICE_PAD_FEATURE_BUTTON)
-    {
-      group = tablet_pad_lookup_button_group (pad, feature_idx);
-      if (!group)
-        return;
-
-      zwp_tablet_pad_v2_set_feedback (pad->wp_tablet_pad, feature_idx, label,
-                                      group->mode_switch_serial);
-    }
-  else if (feature == GDK_DEVICE_PAD_FEATURE_RING)
-    {
-      struct zwp_tablet_pad_ring_v2 *wp_pad_ring;
-
-      wp_pad_ring = g_list_nth_data (pad->rings, feature_idx);
-      if (!wp_pad_ring)
-        return;
-
-      group = zwp_tablet_pad_ring_v2_get_user_data (wp_pad_ring);
-      zwp_tablet_pad_ring_v2_set_feedback (wp_pad_ring, label,
-                                           group->mode_switch_serial);
-
-    }
-  else if (feature == GDK_DEVICE_PAD_FEATURE_STRIP)
-    {
-      struct zwp_tablet_pad_strip_v2 *wp_pad_strip;
-
-      wp_pad_strip = g_list_nth_data (pad->strips, feature_idx);
-      if (!wp_pad_strip)
-        return;
-
-      group = zwp_tablet_pad_strip_v2_get_user_data (wp_pad_strip);
-      zwp_tablet_pad_strip_v2_set_feedback (wp_pad_strip, label,
-                                            group->mode_switch_serial);
-    }
-}

gdk/wayland/gdkdisplay-wayland.c

@@ -832,8 +832,6 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
  * if no ID has been defined.
  *
  * Returns: (nullable): the startup notification ID for @display
- *
- * Deprecated: 4.10.
  */
 const char *
 gdk_wayland_display_get_startup_notification_id (GdkDisplay  *display)
@@ -855,8 +853,6 @@ gdk_wayland_display_get_startup_notification_id (GdkDisplay  *display)
  * The startup ID is also what is used to signal that the startup is
  * complete (for example, when opening a window or when calling
  * [method@Gdk.Display.notify_startup_complete]).
- *
- * Deprecated: 4.10. Use [method@Gdk.Toplevel.set_startup_id]
  */
 void
 gdk_wayland_display_set_startup_notification_id (GdkDisplay *display,
@@ -985,9 +981,7 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
   display_class->queue_events = _gdk_wayland_display_queue_events;
   display_class->get_app_launch_context = _gdk_wayland_display_get_app_launch_context;
   display_class->get_next_serial = gdk_wayland_display_get_next_serial;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   display_class->get_startup_notification_id = gdk_wayland_display_get_startup_notification_id;
-G_GNUC_END_IGNORE_DEPRECATIONS
   display_class->notify_startup_complete = gdk_wayland_display_notify_startup_complete;
   display_class->create_surface = _gdk_wayland_display_create_surface;
   display_class->get_keymap = _gdk_wayland_display_get_keymap;
@@ -2332,7 +2326,6 @@ apply_monitor_change (GdkWaylandMonitor *monitor)
                               monitor->x, monitor->y,
                               monitor->width, monitor->height });
   gdk_monitor_set_connector (GDK_MONITOR (monitor), monitor->name);
-  gdk_monitor_set_description (GDK_MONITOR (monitor), monitor->description);
   monitor->wl_output_done = FALSE;
   monitor->xdg_output_done = FALSE;
 
@@ -2389,7 +2382,7 @@ xdg_output_handle_name (void                  *data,
 {
   GdkWaylandMonitor *monitor = (GdkWaylandMonitor *) data;
 
-  GDK_DEBUG (MISC, "handle name xdg-output %d: %s", monitor->id, name);
+  GDK_DEBUG (MISC, "handle name xdg-output %d", monitor->id);
 
   monitor->name = g_strdup (name);
 }
@@ -2399,11 +2392,8 @@ xdg_output_handle_description (void                  *data,
                                struct zxdg_output_v1 *xdg_output,
                                const char            *description)
 {
-  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *) data;
-
-  GDK_DEBUG (MISC, "handle description xdg-output %d: %s", monitor->id, description);
-
-  monitor->description = g_strdup (description);
+  GDK_DEBUG (MISC, "handle description xdg-output %d",
+                   ((GdkWaylandMonitor *)data)->id);
 }
 
 static const struct zxdg_output_v1_listener xdg_output_listener = {

gdk/wayland/gdkmonitor-wayland.c

@@ -46,7 +46,6 @@ gdk_wayland_monitor_finalize (GObject *object)
   GdkWaylandMonitor *monitor = (GdkWaylandMonitor *)object;
 
   g_free (monitor->name);
-  g_free (monitor->description);
 
   g_clear_pointer (&monitor->xdg_output, zxdg_output_v1_destroy);
 

gdk/wayland/gdkmonitor-wayland.h

@@ -38,7 +38,6 @@ struct _GdkWaylandMonitor {
   int32_t width;
   int32_t height;
   char *name;
-  char *description;
   gboolean wl_output_done;
   gboolean xdg_output_done;
 };

gdk/wayland/gdkwaylanddisplay.h

@@ -53,9 +53,9 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_cursor_theme    (GdkDisplay  *display,
                                                                  const char *name,
                                                                  int          size);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 const char *           gdk_wayland_display_get_startup_notification_id (GdkDisplay *display);
-GDK_DEPRECATED_IN_4_10_FOR(gdk_toplevel_set_startup_id)
+GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_startup_notification_id (GdkDisplay *display,
                                                                          const char *startup_id);
 

gdk/wayland/meson.build

@@ -6,17 +6,15 @@ gdk_wayland_sources = files([
   'gdkclipboard-wayland.c',
   'gdkcursor-wayland.c',
   'gdkdevice-wayland.c',
-  'gdkdevicepad-wayland.c',
   'gdkdisplay-wayland.c',
   'gdkdrag-wayland.c',
   'gdkdragsurface-wayland.c',
   'gdkdrop-wayland.c',
   'gdkeventsource.c',
   'gdkglcontext-wayland.c',
-  'gdkkeymap-wayland.c',
+  'gdkkeys-wayland.c',
   'gdkmonitor-wayland.c',
   'gdkprimary-wayland.c',
-  'gdkseat-wayland.c',
   'gdksurface-wayland.c',
   'gdktoplevel-wayland.c',
   'gdkpopup-wayland.c',

gdk/win32/gdkglcontext-win32-wgl.c

@@ -631,14 +631,6 @@ gdk_win32_gl_context_wgl_clear_current (GdkGLContext *context)
   return wglMakeCurrent (NULL, NULL);
 }
 
-static gboolean
-gdk_win32_gl_context_wgl_is_current (GdkGLContext *context)
-{
-  GdkWin32GLContextWGL *self = GDK_WIN32_GL_CONTEXT_WGL (context);
-
-  return self->wgl_context == wglGetCurrentContext ();
-}
-
 static gboolean
 gdk_win32_gl_context_wgl_make_current (GdkGLContext *context,
                                        gboolean      surfaceless)
@@ -690,7 +682,6 @@ gdk_win32_gl_context_wgl_class_init (GdkWin32GLContextWGLClass *klass)
   context_class->realize = gdk_win32_gl_context_wgl_realize;
   context_class->make_current = gdk_win32_gl_context_wgl_make_current;
   context_class->clear_current = gdk_win32_gl_context_wgl_clear_current;
-  context_class->is_current = gdk_win32_gl_context_wgl_is_current;
 
   draw_context_class->begin_frame = gdk_win32_gl_context_wgl_begin_frame;
   draw_context_class->end_frame = gdk_win32_gl_context_wgl_end_frame;

gdk/win32/gdkmonitor-win32.c

@@ -740,6 +740,7 @@ GPtrArray *
 _gdk_win32_display_get_monitor_list (GdkWin32Display *win32_display)
 {
   EnumMonitorData data;
+  int i;
 
   data.display = win32_display;
   data.monitors = get_monitor_devices (win32_display);

gdk/x11/gdkdevicemanager-xi2.c

@@ -2066,10 +2066,19 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
             xev->detail != XINotifyInferior && xev->mode != XINotifyPassiveUngrab &&
             GDK_IS_TOPLEVEL (surface))
           {
-            GList *l;
+            if (gdk_x11_device_xi2_get_device_type ((GdkX11DeviceXI2 *) device) != GDK_X11_DEVICE_TYPE_LOGICAL)
+              _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device));
+            else
+              {
+                GList *physical_devices, *l;
 
-            for (l = device_manager->devices; l; l = l->next)
-              _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data));
+                physical_devices = gdk_device_list_physical_devices (source_device);
+
+                for (l = physical_devices; l; l = l->next)
+                  _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data));
+
+                g_list_free (physical_devices);
+              }
           }
 
         event = gdk_crossing_event_new (ev->evtype == XI_Enter

gdk/x11/gdkdisplay-x11.c

@@ -2074,10 +2074,8 @@ gdk_x11_display_make_default (GdkDisplay *display)
   display_x11->startup_notification_id = NULL;
 
   startup_id = gdk_get_startup_notification_id ();
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   if (startup_id)
     gdk_x11_display_set_startup_notification_id (display, startup_id);
-G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
@@ -2305,8 +2303,6 @@ gdk_x11_display_get_user_time (GdkDisplay *display)
  * Gets the startup notification ID for a display.
  * 
  * Returns: the startup notification ID for @display
- *
- * Deprecated: 4.10
  */
 const char *
 gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
@@ -2333,9 +2329,7 @@ gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
  * The startup ID is also what is used to signal that the startup is
  * complete (for example, when opening a window or when calling
  * gdk_display_notify_startup_complete()).
- *
- * Deprecated: 4.10: Using [method@Gdk.Toplevel.set_startup_id] is sufficient
- */
+ **/
 void
 gdk_x11_display_set_startup_notification_id (GdkDisplay  *display,
                                              const char *startup_id)
@@ -3048,9 +3042,7 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->get_app_launch_context = _gdk_x11_display_get_app_launch_context;
 
   display_class->get_next_serial = gdk_x11_display_get_next_serial;
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   display_class->get_startup_notification_id = gdk_x11_display_get_startup_notification_id;
-G_GNUC_END_IGNORE_DEPRECATIONS
   display_class->notify_startup_complete = gdk_x11_display_notify_startup_complete;
   display_class->create_surface = _gdk_x11_display_create_surface;
   display_class->get_keymap = gdk_x11_display_get_keymap;

gdk/x11/gdkglcontext-glx.c

@@ -210,14 +210,6 @@ gdk_x11_gl_context_glx_clear_current (GdkGLContext *context)
   return TRUE;
 }
 
-static gboolean
-gdk_x11_gl_context_glx_is_current (GdkGLContext *context)
-{
-  GdkX11GLContextGLX *self = GDK_X11_GL_CONTEXT_GLX (context);
-
-  return self->glx_context == glXGetCurrentContext ();
-}
-
 static gboolean
 gdk_x11_gl_context_glx_make_current (GdkGLContext *context,
                                      gboolean      surfaceless)
@@ -693,7 +685,6 @@ gdk_x11_gl_context_glx_class_init (GdkX11GLContextGLXClass *klass)
   context_class->realize = gdk_x11_gl_context_glx_realize;
   context_class->make_current = gdk_x11_gl_context_glx_make_current;
   context_class->clear_current = gdk_x11_gl_context_glx_clear_current;
-  context_class->is_current = gdk_x11_gl_context_glx_is_current;
   context_class->get_damage = gdk_x11_gl_context_glx_get_damage;
 
   draw_context_class->end_frame = gdk_x11_gl_context_glx_end_frame;

gdk/x11/gdkselectionoutputstream-x11.c

@@ -982,7 +982,7 @@ gdk_x11_selection_output_streams_request (GdkDisplay                   *display,
               GOutputStream *stream;
 
               if (special_targets[i].mime_type)
-                gdk_intern_mime_type (special_targets[i].mime_type);
+                mime_type = gdk_intern_mime_type (special_targets[i].mime_type);
               stream = gdk_x11_selection_output_stream_new (display,
                                                             notify,
                                                             requestor,

gdk/x11/gdkx11display.h

@@ -80,9 +80,9 @@ Cursor        gdk_x11_display_get_xcursor      (GdkDisplay  *display,
 GDK_AVAILABLE_IN_ALL
 guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
 
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 const char * gdk_x11_display_get_startup_notification_id         (GdkDisplay *display);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_startup_notification_id         (GdkDisplay  *display,
                                                                    const char *startup_id);
 GDK_AVAILABLE_IN_ALL

gsk/gl/gskglcommandqueue.c

@@ -956,7 +956,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue    *self,
                               guint                 default_framebuffer)
 {
   G_GNUC_UNUSED guint count = 0;
-  graphene_rect_t scissor_test = GRAPHENE_RECT_INIT (0, 0, 0, 0);
+  graphene_rect_t scissor_test;
   gboolean has_scissor = scissor != NULL;
   gboolean scissor_state = -1;
   guint program = 0;

gsk/gl/gskgldriver.c

@@ -184,7 +184,7 @@ gsk_gl_driver_shader_weak_cb (gpointer  data,
     }
 }
 
-G_GNUC_UNUSED G_GNUC_NULL_TERMINATED static inline GBytes *
+G_GNUC_NULL_TERMINATED static inline GBytes *
 join_sources (GBytes *first_bytes,
               ...)
 {

gtk/a11y/gtkatspicontext.c

@@ -82,10 +82,6 @@
  *   hold the TAB_PANEL role and be the target of the CONTROLS
  *   relation with their corresponding tabs (in the stack
  *   switcher or notebook).
- *
- * These are the exceptions implemented by GTK itself, but note that application
- * developers can customize the accessibility tree by implementing the
- * [iface@Gtk.Accessible] interface in any way they choose.
  */
 
 struct _GtkAtSpiContext
@@ -333,43 +329,32 @@ collect_relations (GtkAtSpiContext *self,
 /* }}} */
 /* {{{ Accessible implementation */
 static int
-get_index_in (GtkAccessible *parent,
-              GtkAccessible *child)
+get_index_in_parent (GtkWidget *widget)
 {
-  GtkAccessible *candidate;
-  guint res;
+  GtkWidget *parent = gtk_widget_get_parent (widget);
+  GtkWidget *child;
+  int idx;
 
   if (parent == NULL)
     return -1;
 
-  res = 0;
-  for (candidate = gtk_accessible_get_first_accessible_child (parent);
-       candidate != NULL;
-       candidate = gtk_accessible_get_next_accessible_sibling (candidate))
+  idx = 0;
+  for (child = gtk_widget_get_first_child (parent);
+       child;
+       child = gtk_widget_get_next_sibling (child))
     {
-      if (candidate == child)
-        return res;
+      if (child == widget)
+        return idx;
 
-      if (!gtk_accessible_should_present (candidate))
+      if (!gtk_accessible_should_present (GTK_ACCESSIBLE (child)))
         continue;
 
-      res++;
+      idx++;
     }
 
   return -1;
 }
 
-static int
-get_index_in_parent (GtkAccessible *accessible)
-{
-  GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);
-
-  if (parent != NULL)
-    return get_index_in (parent, accessible);
-
-  return -1;
-}
-
 static int
 get_index_in_toplevels (GtkWidget *widget)
 {
@@ -402,21 +387,61 @@ get_parent_context_ref (GtkAccessible *accessible)
 {
   GVariant *res = NULL;
 
-  GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);
-
-  if (parent == NULL)
+  if (GTK_IS_WIDGET (accessible))
     {
-      GtkATContext *context = gtk_accessible_get_at_context (accessible);
-      GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (context);
+      GtkWidget *widget = GTK_WIDGET (accessible);
+      GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      res = gtk_at_spi_root_to_ref (self->root);
+      if (parent == NULL)
+        {
+          GtkATContext *context = gtk_accessible_get_at_context (accessible);
+          GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (context);
+
+          res = gtk_at_spi_root_to_ref (self->root);
+        }
+      else if (GTK_IS_STACK (parent))
+        {
+          GtkStackPage *page =
+            gtk_stack_get_page (GTK_STACK (parent), widget);
+          GtkATContext *parent_context =
+            gtk_accessible_get_at_context (GTK_ACCESSIBLE (page));
+
+          if (parent_context != NULL)
+            {
+              gtk_at_context_realize (parent_context);
+
+              res = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (parent_context));
+            }
+        }
+      else
+        {
+          GtkATContext *parent_context =
+            gtk_accessible_get_at_context (GTK_ACCESSIBLE (parent));
+
+          if (parent_context != NULL)
+            {
+              /* XXX: This realize() is needed otherwise opening a GtkPopover will
+               * emit a warning when getting the context's reference
+               */
+              gtk_at_context_realize (parent_context);
+
+              res = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (parent_context));
+            }
+        }
     }
-  else
+  else if (GTK_IS_STACK_PAGE (accessible))
     {
-      GtkATContext *parent_context = gtk_accessible_get_at_context (parent);
-      gtk_at_context_realize (parent_context);
+      GtkWidget *parent =
+        gtk_widget_get_parent (gtk_stack_page_get_child (GTK_STACK_PAGE (accessible)));
+      GtkATContext *parent_context =
+        gtk_accessible_get_at_context (GTK_ACCESSIBLE (parent));
 
-      res = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (parent_context));
+      if (parent_context != NULL)
+        {
+          gtk_at_context_realize (parent_context);
+
+          res = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (parent_context));
+        }
     }
 
   if (res == NULL)
@@ -497,30 +522,49 @@ handle_accessible_method (GDBusConnection       *connection,
     {
       GtkATContext *context = NULL;
       GtkAccessible *accessible;
-      int idx, presentable_idx;
+      int idx, real_idx = 0;
 
       g_variant_get (parameters, "(i)", &idx);
 
       accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
 
-      GtkAccessible *child;
-
-      presentable_idx = 0;
-      for (child = gtk_accessible_get_first_accessible_child (accessible);
-           child != NULL;
-           child = gtk_accessible_get_next_accessible_sibling (child))
+      if (GTK_IS_STACK_PAGE (accessible))
         {
-          if (!gtk_accessible_should_present (child))
-              continue;
-
-          if (presentable_idx == idx)
-            break;
-          presentable_idx++;
+          if (idx == 0)
+            {
+              GtkWidget *child;
 
+              child = gtk_stack_page_get_child (GTK_STACK_PAGE (accessible));
+              if (gtk_accessible_should_present (GTK_ACCESSIBLE (child)))
+                context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
+            }
         }
-      if (child)
+      else if (GTK_IS_WIDGET (accessible))
         {
-          context = gtk_accessible_get_at_context (child);
+          GtkWidget *widget = GTK_WIDGET (accessible);
+          GtkWidget *child;
+
+          real_idx = 0;
+          for (child = gtk_widget_get_first_child (widget);
+               child;
+               child = gtk_widget_get_next_sibling (child))
+            {
+              if (!gtk_accessible_should_present (GTK_ACCESSIBLE (child)))
+                continue;
+
+              if (real_idx == idx)
+                break;
+
+              real_idx += 1;
+            }
+
+          if (child)
+            {
+              if (GTK_IS_STACK (accessible))
+                context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (gtk_stack_get_page (GTK_STACK (accessible), child)));
+              else
+                context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
+            }
         }
 
       if (context == NULL)
@@ -544,24 +588,45 @@ handle_accessible_method (GDBusConnection       *connection,
       GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a(so)"));
 
       GtkAccessible *accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
+      if (GTK_IS_WIDGET (accessible))
+        {
+          GtkWidget *widget = GTK_WIDGET (accessible);
+          GtkWidget *child;
 
-      GtkAccessible *child;
-      for (child = gtk_accessible_get_first_accessible_child (accessible);
-           child != NULL;
-           child = gtk_accessible_get_next_accessible_sibling (child))
-      {
-          if (!gtk_accessible_should_present (child))
-            continue;
+          for (child = gtk_widget_get_first_child (widget);
+               child;
+               child = gtk_widget_get_next_sibling (child))
+            {
+              if (!gtk_accessible_should_present (GTK_ACCESSIBLE (child)))
+                continue;
 
-          GtkATContext *context = gtk_accessible_get_at_context (child);
+              GtkATContext *context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
 
-          /* Realize the child ATContext in order to get its ref */
-          gtk_at_context_realize (context);
+              /* Realize the child ATContext in order to get its ref */
+              gtk_at_context_realize (context);
 
-          GVariant *ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
+              GVariant *ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
 
-          if (ref != NULL)
-            g_variant_builder_add (&builder, "@(so)", ref);
+              if (ref != NULL)
+                g_variant_builder_add (&builder, "@(so)", ref);
+            }
+        }
+      else if (GTK_IS_STACK_PAGE (accessible))
+        {
+          GtkWidget *child = gtk_stack_page_get_child (GTK_STACK_PAGE (accessible));
+
+          if (gtk_accessible_should_present (GTK_ACCESSIBLE (child)))
+            {
+              GtkATContext *context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
+
+              /* Realize the child ATContext in order to get its ref */
+              gtk_at_context_realize (context);
+
+              GVariant *ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
+
+              if (ref != NULL)
+                g_variant_builder_add (&builder, "@(so)", ref);
+            }
         }
 
       g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a(so))", &builder));
@@ -850,7 +915,7 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,
 
   if (changed_states & GTK_ACCESSIBLE_STATE_CHANGE_HIDDEN)
     {
-      GtkAccessible *parent;
+      GtkWidget *parent;
       GtkATContext *context;
       GtkAccessibleChildChange change;
 
@@ -867,9 +932,14 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,
         }
       else
         {
-          parent = gtk_accessible_get_accessible_parent (accessible);
+          if (GTK_IS_WIDGET (accessible))
+            parent = gtk_widget_get_parent (GTK_WIDGET (accessible));
+          else if (GTK_IS_STACK_PAGE (accessible))
+            parent = gtk_widget_get_parent (gtk_stack_page_get_child (GTK_STACK_PAGE (accessible)));
+          else
+            g_assert_not_reached ();
 
-          context = gtk_accessible_get_at_context (parent);
+          context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (parent));
           gtk_at_context_child_changed (context, change, accessible);
         }
     }
@@ -1098,9 +1168,29 @@ gtk_at_spi_context_bounds_change (GtkATContext *ctx)
 {
   GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (ctx);
   GtkAccessible *accessible = gtk_at_context_get_accessible (ctx);
-  int x, y, width, height;
-  if (gtk_accessible_get_bounds (accessible, &x, &y, &width, &height))
-    emit_bounds_changed (self, x, y, width, height);
+  GtkWidget *widget;
+  GtkWidget *parent;
+  double x, y;
+  int width, height;
+
+  if (!GTK_IS_WIDGET (accessible))
+    return;
+
+  widget = GTK_WIDGET (accessible);
+  if (!gtk_widget_get_realized (widget))
+    return;
+
+  parent = gtk_widget_get_parent (widget);
+
+  if (parent)
+    gtk_widget_translate_coordinates (widget, parent, 0., 0., &x, &y);
+  else
+    x = y = 0.;
+
+  width = gtk_widget_get_width (widget);
+  height = gtk_widget_get_height (widget);
+
+  emit_bounds_changed (self, (int)x, (int)y, width, height);
 }
 
 static void
@@ -1111,17 +1201,99 @@ gtk_at_spi_context_child_change (GtkATContext             *ctx,
   GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (ctx);
   GtkAccessible *accessible = gtk_at_context_get_accessible (ctx);
   GtkATContext *child_context = gtk_accessible_get_at_context (child);
+  GtkWidget *parent_widget;
+  GtkWidget *child_widget;
+  int idx = 0;
+
+  if (!GTK_IS_WIDGET (accessible))
+    return;
 
   if (child_context == NULL)
     return;
 
-  GtkAccessible *parent = gtk_accessible_get_accessible_parent (child);
-  int idx = 0;
+  /* handle the stack page special case */
+  if (GTK_IS_WIDGET (child) &&
+      GTK_IS_STACK (gtk_widget_get_parent (GTK_WIDGET (child))))
+    {
+      GtkWidget *stack;
+      GtkStackPage *page;
+      GListModel *pages;
 
-  if (parent == NULL)
-    idx = -1;
-  else if (parent == accessible)
-    idx = get_index_in (accessible, child);
+      stack = gtk_widget_get_parent (GTK_WIDGET (child));
+      page = gtk_stack_get_page (GTK_STACK (stack), GTK_WIDGET (child));
+      pages = G_LIST_MODEL (gtk_stack_get_pages (GTK_STACK (stack)));
+      idx = 0;
+      for (guint i = 0; i < g_list_model_get_n_items (pages); i++)
+        {
+          GtkStackPage *item = g_list_model_get_item (pages, i);
+
+          g_object_unref (item);
+
+          if (!gtk_accessible_should_present (GTK_ACCESSIBLE (item)))
+            continue;
+
+          if (item == page)
+            break;
+
+          idx++;
+        }
+      g_object_unref (pages);
+
+      if (change & GTK_ACCESSIBLE_CHILD_CHANGE_ADDED)
+        {
+          emit_children_changed (GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (stack))),
+                                 GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (page))),
+                                 idx,
+                                 GTK_ACCESSIBLE_CHILD_STATE_ADDED);
+
+          emit_children_changed (GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (page))),
+                                 GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (child)),
+                                 0,
+                                 GTK_ACCESSIBLE_CHILD_STATE_ADDED);
+        }
+
+      if (change & GTK_ACCESSIBLE_CHILD_CHANGE_REMOVED)
+        {
+          emit_children_changed (GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (page))),
+                                 GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (child)),
+                                 0,
+                                 GTK_ACCESSIBLE_CHILD_STATE_REMOVED);
+          emit_children_changed (GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (stack))),
+                                 GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (page))),
+                                 idx,
+                                 GTK_ACCESSIBLE_CHILD_STATE_REMOVED);
+
+        }
+
+      return;
+    }
+
+  parent_widget = GTK_WIDGET (accessible);
+
+  if (GTK_IS_STACK_PAGE (child))
+    child_widget = gtk_stack_page_get_child (GTK_STACK_PAGE (child));
+  else
+    child_widget = GTK_WIDGET (child);
+
+  if (gtk_widget_get_parent (child_widget) != parent_widget)
+    {
+      idx = 0;
+    }
+  else
+    {
+      for (GtkWidget *iter = gtk_widget_get_first_child (parent_widget);
+           iter != NULL;
+           iter = gtk_widget_get_next_sibling (iter))
+        {
+          if (!gtk_accessible_should_present (GTK_ACCESSIBLE (iter)))
+            continue;
+
+          if (iter == child_widget)
+            break;
+
+          idx += 1;
+        }
+    }
 
   if (change & GTK_ACCESSIBLE_CHILD_CHANGE_ADDED)
     emit_children_changed (self,
@@ -1686,8 +1858,12 @@ gtk_at_spi_context_get_index_in_parent (GtkAtSpiContext *self)
 
   if (GTK_IS_ROOT (accessible))
     idx = get_index_in_toplevels (GTK_WIDGET (accessible));
+  else if (GTK_IS_STACK_PAGE (accessible))
+    idx = get_index_in_parent (gtk_stack_page_get_child (GTK_STACK_PAGE (accessible)));
+  else if (GTK_IS_STACK (gtk_widget_get_parent (GTK_WIDGET (accessible))))
+    idx = 1;
   else
-    idx = get_index_in_parent  (accessible);
+    idx = get_index_in_parent (GTK_WIDGET (accessible));
 
   return idx;
 }
@@ -1698,18 +1874,26 @@ gtk_at_spi_context_get_child_count (GtkAtSpiContext *self)
   g_return_val_if_fail (GTK_IS_AT_SPI_CONTEXT (self), -1);
 
   GtkAccessible *accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
-  int n_children = 0;
+  int n_children = -1;
 
-  GtkAccessible *child = NULL;
-
-  for (child = gtk_accessible_get_first_accessible_child (accessible);
-       child != NULL;
-       child = gtk_accessible_get_next_accessible_sibling (child))
+  if (GTK_IS_WIDGET (accessible))
     {
-      if (!gtk_accessible_should_present (child))
-        continue;
+      GtkWidget *child;
 
-      n_children++;
+      n_children = 0;
+      for (child = gtk_widget_get_first_child (GTK_WIDGET (accessible));
+           child;
+           child = gtk_widget_get_next_sibling (child))
+        {
+          if (!gtk_accessible_should_present (GTK_ACCESSIBLE (child)))
+            continue;
+
+          n_children++;
+        }
+    }
+  else if (GTK_IS_STACK_PAGE (accessible))
+    {
+      n_children = 1;
     }
 
   return n_children;

gtk/css/gtkcssparser.c

@@ -962,7 +962,7 @@ gtk_css_parser_parse_url_arg (GtkCssParser *parser,
  * gtk_css_parser_consume_url:
  * @self: a `GtkCssParser`
  *
- * If the parser matches the `<url>` token from the [CSS
+ * If the parser matches the <url> token from the [CSS
  * specification](https://drafts.csswg.org/css-values-4/#url-value),
  * consumes it, resolves the URL and returns the resulting `GFile`.
  * On failure, an error is emitted and %NULL is returned.

gtk/deprecated/gtkcomboboxtext.c

@@ -59,8 +59,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * ## GtkComboBoxText as GtkBuildable
  *
  * The `GtkComboBoxText` implementation of the `GtkBuildable` interface supports
- * adding items directly using the `<items>` element and specifying `<item>`
- * elements for each item. Each `<item>` element can specify the “id”
+ * adding items directly using the <items> element and specifying <item>
+ * elements for each item. Each <item> element can specify the “id”
  * corresponding to the appended text and also supports the regular
  * translation attributes “translatable”, “context” and “comments”.
  *

gtk/deprecated/gtkshow.c

@@ -99,8 +99,7 @@ window_handle_exported (GtkWindow  *window,
  * This is the recommended call to be used as it passes information
  * necessary for sandbox helpers to parent their dialogs properly.
  *
- * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch] or
- *   [method@Gtk.UriLauncher.launch] instead
+ * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch] instead
  */
 void
 gtk_show_uri_full (GtkWindow           *parent,
@@ -148,8 +147,7 @@ gtk_show_uri_full (GtkWindow           *parent,
  * Returns: %TRUE if the URI was shown successfully.
  *   Otherwise, %FALSE is returned and @error is set
  *
- * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch_finish] or
- *   [method@Gtk.UriLauncher.launch_finish] instead
+ * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch_finish] instead
  */
 gboolean
 gtk_show_uri_full_finish (GtkWindow     *parent,
@@ -193,8 +191,7 @@ show_uri_done (GObject      *object,
  * This function launches the default application for showing
  * a given uri, or shows an error dialog if that fails.
  *
- * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch] or
- *   [method@Gtk.UriLauncher.launch] instead
+ * Deprecated: 4.10: Use [method@Gtk.FileLauncher.launch] instead
  */
 void
 gtk_show_uri (GtkWindow  *parent,

gtk/deprecated/gtktreestore.c

@@ -47,8 +47,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * ## GtkTreeStore as GtkBuildable
  *
  * The GtkTreeStore implementation of the `GtkBuildable` interface allows
- * to specify the model columns with a `<columns>` element that may contain
- * multiple `<column>` elements, each specifying one model column. The “type”
+ * to specify the model columns with a <columns> element that may contain
+ * multiple <column> elements, each specifying one model column. The “type”
  * attribute specifies the data type for the column.
  *
  * An example of a UI Definition fragment for a tree store:

gtk/deprecated/meson.build

@@ -3,7 +3,6 @@ gtk_deprecated_sources = [
   'deprecated/gtkappchooserbutton.c',
   'deprecated/gtkappchooserdialog.c',
   'deprecated/gtkappchooserwidget.c',
-  'deprecated/gtkassistant.c',
   'deprecated/gtkcellarea.c',
   'deprecated/gtkcellareabox.c',
   'deprecated/gtkcellareacontext.c',
@@ -32,10 +31,8 @@ gtk_deprecated_sources = [
   'deprecated/gtkiconview.c',
   'deprecated/gtkinfobar.c',
   'deprecated/gtkliststore.c',
-  'deprecated/gtklockbutton.c',
   'deprecated/gtkrender.c',
   'deprecated/gtkshow.c',
-  'deprecated/gtkstatusbar.c',
   'deprecated/gtkstylecontext.c',
   'deprecated/gtktreedatalist.c',
   'deprecated/gtktreednd.c',
@@ -56,7 +53,6 @@ gtk_deprecated_headers = [
   'deprecated/gtkappchooserbutton.h',
   'deprecated/gtkappchooserdialog.h',
   'deprecated/gtkappchooserwidget.h',
-  'deprecated/gtkassistant.h',
   'deprecated/gtkcellarea.h',
   'deprecated/gtkcellareabox.h',
   'deprecated/gtkcellareacontext.h',
@@ -91,11 +87,9 @@ gtk_deprecated_headers = [
   'deprecated/gtkiconview.h',
   'deprecated/gtkinfobar.h',
   'deprecated/gtkliststore.h',
-  'deprecated/gtklockbutton.h',
   'deprecated/gtkmessagedialog.h',
   'deprecated/gtkrender.h',
   'deprecated/gtkshow.h',
-  'deprecated/gtkstatusbar.h',
   'deprecated/gtkstylecontext.h',
   'deprecated/gtktreednd.h',
   'deprecated/gtktreemodel.h',

gtk/gdkpixbufutils.c

@@ -587,12 +587,10 @@ gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
 
   if (gdk_texture_can_load (bytes))
     {
+      /* We know these formats can't be scaled */
       texture = gdk_texture_new_from_bytes (bytes, NULL);
       if (texture == NULL)
         return NULL;
-
-      /* We know these formats can't be scaled */
-      paintable = GDK_PAINTABLE (texture);
     }
   else
     {
@@ -612,15 +610,15 @@ gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
 
       texture = gdk_texture_new_for_pixbuf (gdk_pixbuf_loader_get_pixbuf (loader));
       g_object_unref (loader);
-
-      if (loader_data.scale_factor != 1)
-        paintable = gtk_scaler_new (GDK_PAINTABLE (texture), loader_data.scale_factor);
-      else
-        paintable = g_object_ref (GDK_PAINTABLE (texture));
-
-      g_object_unref (texture);
     }
 
+  if (loader_data.scale_factor != 1)
+    paintable = gtk_scaler_new (GDK_PAINTABLE (texture), loader_data.scale_factor);
+  else
+    paintable = g_object_ref ((GdkPaintable *)texture);
+
+  g_object_unref (texture);
+
   return paintable;
 }
 

gtk/gopenuriportal.c

@@ -103,7 +103,6 @@ enum {
 typedef struct {
   GtkWindow *parent;
   GFile *file;
-  char *uri;
   gboolean open_folder;
   GDBusConnection *connection;
   GCancellable *cancellable;
@@ -126,7 +125,6 @@ open_uri_data_free (OpenUriData *data)
     gtk_window_unexport_handle (data->parent);
   g_clear_object (&data->parent);
   g_clear_object (&data->file);
-  g_free (data->uri);
   g_clear_object (&data->cancellable);
   g_clear_object (&data->task);
   g_free (data->handle);
@@ -260,13 +258,14 @@ canceled (GCancellable *cancellable,
 }
 
 static void
-open_uri (OpenUriData         *data,
+open_uri (GFile               *file,
+          gboolean             open_folder,
           const char          *parent_window,
           const char          *activation_token,
-          GAsyncReadyCallback  callback)
+          GAsyncReadyCallback  callback,
+          gpointer             user_data)
 {
-  GFile *file = data->file;
-  gboolean open_folder = data->open_folder;
+  OpenUriData *data = user_data;
   GTask *task;
   GVariant *opts = NULL;
   int i;
@@ -278,9 +277,9 @@ open_uri (OpenUriData         *data,
   connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (openuri));
   data->connection = g_object_ref (connection);
 
-  task = g_task_new (NULL, NULL, callback, data);
+  task = g_task_new (NULL, NULL, callback, user_data);
   g_task_set_check_cancellable (task, FALSE);
-  g_task_set_task_data (task, data, NULL);
+  g_task_set_task_data (task, user_data, NULL);
   if (data->cancellable)
     data->cancel_handler = g_signal_connect (data->cancellable, "cancelled", G_CALLBACK (canceled), task);
 
@@ -313,7 +312,7 @@ open_uri (OpenUriData         *data,
 
   opts = g_variant_builder_end (&opt_builder);
 
-  if (file && g_file_is_native (file))
+  if (g_file_is_native (file))
     {
       const char *path = NULL;
       GUnixFDList *fd_list = NULL;
@@ -367,15 +366,12 @@ open_uri (OpenUriData         *data,
     }
   else
     {
-      char *uri = NULL;
-
-      if (file)
-        uri = g_file_get_uri (file);
+      char *uri = g_file_get_uri (file);
 
       data->call = OPEN_URI;
       gxdp_open_uri_call_open_uri (openuri,
                                    parent_window ? parent_window : "",
-                                   uri ? uri : data->uri,
+                                   uri,
                                    opts,
                                    NULL,
                                    open_call_done,
@@ -435,7 +431,7 @@ window_handle_exported (GtkWindow  *window,
   activation_token = G_APP_LAUNCH_CONTEXT_GET_CLASS (context)->get_startup_notify_id (context, NULL, NULL);
   g_object_unref (context);
 
-  open_uri (data, handle, activation_token, open_uri_done);
+  open_uri (data->file, data->open_folder, handle, activation_token, open_uri_done, data);
 
   g_free (activation_token);
 }
@@ -475,45 +471,5 @@ gboolean
 g_openuri_portal_open_finish (GAsyncResult  *result,
                               GError       **error)
 {
-  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == g_openuri_portal_open_async, FALSE);
-
-  return g_task_propagate_boolean (G_TASK (result), error);
-}
-
-void
-g_openuri_portal_open_uri_async (const char          *uri,
-                                 GtkWindow           *parent,
-                                 GCancellable        *cancellable,
-                                 GAsyncReadyCallback  callback,
-                                 gpointer             user_data)
-{
-  OpenUriData *data;
-
-  if (!init_openuri_portal ())
-    {
-      g_task_report_new_error (NULL, callback, user_data, NULL,
-                               GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_FAILED,
-                               "The OpenURI portal is not available");
-      return;
-    }
-
-  data = g_new0 (OpenUriData, 1);
-  data->parent = parent ? g_object_ref (parent) : NULL;
-  data->uri = g_strdup (uri);
-  data->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
-  data->task = g_task_new (parent, cancellable, callback, user_data);
-  g_task_set_check_cancellable (data->task, FALSE);
-  g_task_set_source_tag (data->task, g_openuri_portal_open_uri_async);
-
-  if (!parent || !gtk_window_export_handle (parent, window_handle_exported, data))
-    window_handle_exported (parent, NULL, data);
-}
-
-gboolean
-g_openuri_portal_open_uri_finish (GAsyncResult  *result,
-                                  GError       **error)
-{
-  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == g_openuri_portal_open_uri_async, FALSE);
-
   return g_task_propagate_boolean (G_TASK (result), error);
 }

gtk/gopenuriportal.h

@@ -38,15 +38,6 @@ void     g_openuri_portal_open_async   (GFile               *file,
 gboolean g_openuri_portal_open_finish  (GAsyncResult        *result,
                                         GError             **error);
 
-void     g_openuri_portal_open_uri_async  (const char          *uri,
-                                           GtkWindow           *window,
-                                           GCancellable        *cancellable,
-                                           GAsyncReadyCallback  callback,
-                                           gpointer             user_data);
-
-gboolean g_openuri_portal_open_uri_finish (GAsyncResult        *result,
-                                           GError             **error);
-
 G_END_DECLS
 
 #endif

gtk/gtk.h

@@ -46,7 +46,7 @@
 #include <gtk/gtkapplication.h>
 #include <gtk/gtkapplicationwindow.h>
 #include <gtk/gtkaspectframe.h>
-#include <gtk/deprecated/gtkassistant.h>
+#include <gtk/gtkassistant.h>
 #include <gtk/gtkatcontext.h>
 #include <gtk/gtkbinlayout.h>
 #include <gtk/gtkbitset.h>
@@ -177,7 +177,7 @@
 #include <gtk/gtklistitemfactory.h>
 #include <gtk/deprecated/gtkliststore.h>
 #include <gtk/gtklistview.h>
-#include <gtk/deprecated/gtklockbutton.h>
+#include <gtk/gtklockbutton.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmaplistmodel.h>
 #include <gtk/gtkmediacontrols.h>
@@ -252,7 +252,7 @@
 #include <gtk/gtkspinner.h>
 #include <gtk/gtkstack.h>
 #include <gtk/gtkstackswitcher.h>
-#include <gtk/deprecated/gtkstatusbar.h>
+#include <gtk/gtkstatusbar.h>
 #include <gtk/gtkstringfilter.h>
 #include <gtk/gtkstringlist.h>
 #include <gtk/gtkstringsorter.h>
@@ -286,7 +286,6 @@
 #include <gtk/deprecated/gtktreeviewcolumn.h>
 #include <gtk/gtktypebuiltins.h>
 #include <gtk/gtktypes.h>
-#include <gtk/gtkurilauncher.h>
 #include <gtk/gtkversion.h>
 #include <gtk/gtkvideo.h>
 #include <gtk/gtkviewport.h>

gtk/gtkaboutdialog.c

@@ -44,13 +44,13 @@
 #include "gtkorientable.h"
 #include "gtkscrolledwindow.h"
 #include "gtktextview.h"
+#include "gtkfilelauncher.h"
 #include "gtkmain.h"
 #include "gtktogglebutton.h"
 #include "gtktypebuiltins.h"
 #include "gtkstack.h"
 #include "gtkstackswitcher.h"
 #include "gtksettings.h"
-#include "gtkurilauncher.h"
 #include "gtkheaderbar.h"
 #include "gtkprivate.h"
 #include <glib/gi18n-lib.h>
@@ -932,13 +932,16 @@ static gboolean
 gtk_about_dialog_activate_link (GtkAboutDialog *about,
                                 const char     *uri)
 {
-  GtkUriLauncher *launcher;
+  GtkFileLauncher *launcher;
+  GFile *file;
 
-  launcher = gtk_uri_launcher_new (uri);
+  file = g_file_new_for_uri (uri);
+  launcher = gtk_file_launcher_new (file);
 
-  gtk_uri_launcher_launch (launcher, GTK_WINDOW (about), NULL, NULL, NULL);
+  gtk_file_launcher_launch (launcher, GTK_WINDOW (about), NULL, NULL, NULL);
 
   g_object_unref (launcher);
+  g_object_unref (file);
 
   return TRUE;
 }

gtk/gtkaccessible.c

@@ -37,14 +37,6 @@
  * a way that should be reflected by assistive technologies. For instance,
  * if a `GtkWidget` visibility changes, the %GTK_ACCESSIBLE_STATE_HIDDEN
  * state will also change to reflect the [property@Gtk.Widget:visible] property.
- *
- * Every accessible implementation is part of a tree of accessible objects.
- * Normally, this tree corresponds to the widget tree, but can be customized
- * by reimplementing the [vfunc@Gtk.Accessible.get_accessible_parent],
- * [vfunc@Gtk.Accessible.get_first_accessible_child] and
- * [vfunc@Gtk.Accessible.get_next_accessible_sibling] virtual functions.
- * Note that you can not create a top-level accessible object as of now,
- * which means that you must always have a parent accessible object.
  */
 
 #include "config.h"
@@ -82,7 +74,7 @@ gtk_accessible_default_init (GtkAccessibleInterface *iface)
   g_object_interface_install_property (iface, pspec);
 }
 
-/**
+/*< private >
  * gtk_accessible_get_at_context:
  * @self: a `GtkAccessible`
  *
@@ -99,68 +91,12 @@ gtk_accessible_get_at_context (GtkAccessible *self)
 }
 
 /**
- * gtk_accessible_get_accessible_parent:
+ * gtk_accessible_get_accessible_role: (attributes org.gtk.Method.get_property=accessible-role)
  * @self: a `GtkAccessible`
  *
- * Retrieves the accessible accessible for an accessible object
+ * Retrieves the `GtkAccessibleRole` for the given `GtkAccessible`.
  *
- * This function returns `NULL` for top level widgets
- *
- * Returns: (transfer none) (nullable): the accessible parent
- *
- * Since: 4.10
- */
-GtkAccessible *
-gtk_accessible_get_accessible_parent (GtkAccessible *self)
-{
-  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), NULL);
-
-  return GTK_ACCESSIBLE_GET_IFACE (self)->get_accessible_parent (self);
-}
-
-/**
- * gtk_accessible_get_first_accessible_child:
- * @self: an accessible object
- *
- * Retrieves the first accessible child of an accessible object.
- *
- * Returns: (transfer none) (nullable): the first accessible child
- *
- * since: 4.10
- */
-GtkAccessible *
-gtk_accessible_get_first_accessible_child (GtkAccessible *self)
-{
-  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), NULL);
-
-  return GTK_ACCESSIBLE_GET_IFACE (self)->get_first_accessible_child (self);
-}
-
-/**
- * gtk_accessible_get_next_accessible_sibling:
- * @self: an accessible object
- *
- * Retrieves the next accessible sibling of an accessible object
- *
- * Returns: (transfer none) (nullable): the next accessible sibling
- *
- * since: 4.10
- */
-GtkAccessible *
-gtk_accessible_get_next_accessible_sibling (GtkAccessible *self)
-{
-  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), NULL);
-
-  return GTK_ACCESSIBLE_GET_IFACE (self)->get_next_accessible_sibling (self);
-}
-
-/**
- * gtk_accessible_get_accessible_role:
- * @self: an accessible object
- *
- * Retrieves the accessible role of an accessible object.
- *
- * Returns: the accessible role
+ * Returns: a `GtkAccessibleRole`
  */
 GtkAccessibleRole
 gtk_accessible_get_accessible_role (GtkAccessible *self)
@@ -191,7 +127,6 @@ gtk_accessible_get_accessible_role (GtkAccessible *self)
  * state change must be communicated to assistive technologies.
  *
  * Example:
- *
  * ```c
  * value = GTK_ACCESSIBLE_TRISTATE_MIXED;
  * gtk_accessible_update_state (GTK_ACCESSIBLE (check_button),
@@ -724,10 +659,10 @@ gtk_accessible_role_to_name (GtkAccessibleRole  role,
 /*< private >
  * gtk_accessible_role_is_range_subclass:
  * @role: a `GtkAccessibleRole`
- *
+ * 
  * Checks if @role is considered to be a subclass of %GTK_ACCESSIBLE_ROLE_RANGE
  * according to the WAI-ARIA specification.
- *
+ * 
  * Returns: whether the @role is range-like
  */
 gboolean
@@ -748,7 +683,7 @@ gtk_accessible_role_is_range_subclass (GtkAccessibleRole role)
   return FALSE;
 }
 
-/*< private >
+/*<private>
  * gtk_accessible_platform_changed:
  * @self: a `GtkAccessible`
  * @change: the platform state change to report
@@ -777,7 +712,7 @@ gtk_accessible_platform_changed (GtkAccessible               *self,
 
   /* propagate changes up from ignored widgets */
   if (gtk_accessible_get_accessible_role (self) == GTK_ACCESSIBLE_ROLE_NONE)
-    context = gtk_accessible_get_at_context (gtk_accessible_get_accessible_parent (self));
+    context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (gtk_widget_get_parent (GTK_WIDGET (self))));
 
   if (context == NULL)
     return;
@@ -786,7 +721,7 @@ gtk_accessible_platform_changed (GtkAccessible               *self,
   gtk_at_context_update (context);
 }
 
-/**
+/*<private>
  * gtk_accessible_get_platform_state:
  * @self: a `GtkAccessible`
  * @state: platform state to query
@@ -800,19 +735,15 @@ gtk_accessible_platform_changed (GtkAccessible               *self,
  * child widget, as is the case for `GtkText` wrappers.
  *
  * Returns: the value of @state for the accessible
- *
- * Since: 4.10
  */
 gboolean
 gtk_accessible_get_platform_state (GtkAccessible              *self,
                                    GtkAccessiblePlatformState  state)
 {
-  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), FALSE);
-
   return GTK_ACCESSIBLE_GET_IFACE (self)->get_platform_state (self, state);
 }
 
-/*< private >
+/*<private>
  * gtk_accessible_bounds_changed:
  * @self: a `GtkAccessible`
  *
@@ -821,7 +752,7 @@ gtk_accessible_get_platform_state (GtkAccessible              *self,
  * changed.
  *
  * Note that the bounds are not included in this API.
- * AT backends should use [method@Gtk.Accessible.get_bounds] to get them.
+ * AT backends should use widget API to obtain them.
  */
 void
 gtk_accessible_bounds_changed (GtkAccessible *self)
@@ -839,39 +770,7 @@ gtk_accessible_bounds_changed (GtkAccessible *self)
   gtk_at_context_bounds_changed (context);
 }
 
-/**
- * gtk_accessible_get_bounds:
- * @self: a `GtkAccessible`
- * @x: (out): the x coordinate of the top left corner of the accessible
- * @y: (out): the y coordinate of the top left corner of the widget
- * @width: (out): the width of the accessible object
- * @height: (out): the height of the accessible object
- *
- * Queries the coordinates and dimensions of this accessible
- *
- * This functionality can be overridden by `GtkAccessible`
- * implementations, e.g. to get the bounds from an ignored
- * child widget.
- *
- * Returns: true if the bounds are valid, and false otherwise
- *
- * Since: 4.10
- */
-gboolean
-gtk_accessible_get_bounds (GtkAccessible *self,
-                           int           *x,
-                           int           *y,
-                           int           *width,
-                           int           *height)
-{
-  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), FALSE);
-  g_return_val_if_fail (x != NULL && y != NULL, FALSE);
-  g_return_val_if_fail (width != NULL && height != NULL, FALSE);
-
-  return GTK_ACCESSIBLE_GET_IFACE (self)->get_bounds (self, x, y, width, height);
-}
-
-/*< private >
+/*<private>
  * gtk_accessible_should_present:
  * @self: a `GtkAccessible`
  *
@@ -930,7 +829,7 @@ gtk_accessible_update_children (GtkAccessible           *self,
 
   /* propagate changes up from ignored widgets */
   if (gtk_accessible_get_accessible_role (self) == GTK_ACCESSIBLE_ROLE_NONE)
-    context = gtk_accessible_get_at_context (gtk_accessible_get_accessible_parent (self));
+    context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (gtk_widget_get_parent (GTK_WIDGET (self))));
 
   if (context == NULL)
     return;

gtk/gtkaccessible.h

@@ -32,199 +32,58 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_ACCESSIBLE (gtk_accessible_get_type())
 
-GDK_AVAILABLE_IN_4_10
+GDK_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE (GtkAccessible, gtk_accessible, GTK, ACCESSIBLE, GObject)
 
-/**
- * GtkAccessiblePlatformState:
- * @GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSABLE: whether the accessible can be focused
- * @GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED: whether the accessible has focus
- * @GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE: whether the accessible is active
- *
- * The various platform states which can be queried
- * using [method@Gtk.Accessible.get_platform_state].
- *
- * Since: 4.10
- */
-typedef enum {
-  GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSABLE,
-  GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED,
-  GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE
-} GtkAccessiblePlatformState;
-
-/**
- * GtkAccessibleInterface:
- * @get_at_context: retrieve the platform-specific accessibility context
- *   for the accessible implementation
- * @get_platform_state: retrieve the accessible state
- *
- * The common interface for accessible objects.
- *
- * Since: 4.10
- */
-struct _GtkAccessibleInterface
-{
-  GTypeInterface g_iface;
-
-  /**
-   * GtkAccessibleInterface::get_at_context:
-   * @self: an accessible object
-   *
-   * Retrieves the platform-specific accessibility context for the
-   * accessible implementation.
-   *
-   * Returns: (transfer none) (nullable): the accessibility context
-   *
-   * Since: 4.10
-   */
-  GtkATContext * (* get_at_context) (GtkAccessible *self);
-
-  /**
-   * GtkAccessibleInterface::get_platform_state:
-   * @self: an accessible object
-   * @state: the state to query
-   *
-   * Checks if the given @state applies to the accessible object.
-   *
-   * Returns: true if the @state is set, and false otherwise
-   *
-   * Since: 4.10
-   */
-  gboolean (* get_platform_state) (GtkAccessible              *self,
-                                   GtkAccessiblePlatformState  state);
-
-  /**
-   * GtkAccessibleInterface::get_accessible_parent:
-   * @self: an accessible object
-   *
-   * Retrieves the accessible parent of an accessible object.
-   *
-   * This virtual function should return `NULL` for top level objects.
-   *
-   * Returns: (nullable) (transfer none): the accessible parent
-   *
-   * Since: 4.10
-   */
-  GtkAccessible * (* get_accessible_parent) (GtkAccessible *self);
-
-  /**
-   * GtkaccessibleInterface::get_first_accessible_child:
-   * @self: an accessible object
-   *
-   * Retrieves the first accessible child of an accessible object.
-   *
-   * Returns: (transfer none) (nullable): an accessible object
-   *
-   * Since: 4.10
-   */
-  GtkAccessible * (* get_first_accessible_child) (GtkAccessible *self);
-
-  /**
-   * GtkaccessibleInterface::get_next_accessible_sibling:
-   * @self: an accessible object
-   *
-   * Retrieves the next accessible sibling of an accessible object.
-   *
-   * Returns: (transfer none) (nullable): an accessible object
-   *
-   * Since: 4.10
-   */
-  GtkAccessible * (* get_next_accessible_sibling) (GtkAccessible *self);
-
-  /**
-   * GtkAccessibleInterface::get_bounds:
-   * @self: an accessible object
-   * @x: (out): the horizontal coordinate of a rectangle
-   * @y: (out): the vertical coordinate of a rectangle
-   * @width: (out): the width of a rectangle
-   * @height: (out): the height of a rectangle
-   *
-   * Retrieves the dimensions and position of an accessible object in its
-   * parent's coordinate space, if those values can be determined.
-   *
-   * For top level accessible objects, the X and Y coordinates are always
-   * going to be set to zero.
-   *
-   * Returns: true if the values are value, and false otherwise
-   */
-  gboolean (* get_bounds) (GtkAccessible *self,
-                           int           *x,
-                           int           *y,
-                           int           *width,
-                           int           *height);
-};
+GDK_AVAILABLE_IN_ALL
+GtkAccessibleRole       gtk_accessible_get_accessible_role      (GtkAccessible         *self);
 
 GDK_AVAILABLE_IN_ALL
-GtkATContext *  gtk_accessible_get_at_context   (GtkAccessible *self);
-
-GDK_AVAILABLE_IN_4_10
-gboolean gtk_accessible_get_platform_state (GtkAccessible              *self,
-                                            GtkAccessiblePlatformState  state);
-
-GDK_AVAILABLE_IN_4_10
-GtkAccessible * gtk_accessible_get_accessible_parent (GtkAccessible *self);
-
-GDK_AVAILABLE_IN_4_10
-GtkAccessible * gtk_accessible_get_first_accessible_child (GtkAccessible *self);
-
-GDK_AVAILABLE_IN_4_10
-GtkAccessible * gtk_accessible_get_next_accessible_sibling (GtkAccessible *self);
-
-GDK_AVAILABLE_IN_4_10
-gboolean gtk_accessible_get_bounds (GtkAccessible *self,
-                                    int           *x,
-                                    int           *y,
-                                    int           *width,
-                                    int           *height);
+void                    gtk_accessible_update_state             (GtkAccessible         *self,
+                                                                 GtkAccessibleState     first_state,
+                                                                 ...);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_accessible_update_property          (GtkAccessible         *self,
+                                                                 GtkAccessibleProperty  first_property,
+                                                                 ...);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_accessible_update_relation          (GtkAccessible         *self,
+                                                                 GtkAccessibleRelation  first_relation,
+                                                                 ...);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_accessible_update_state_value       (GtkAccessible         *self,
+                                                                 int                    n_states,
+                                                                 GtkAccessibleState     states[],
+                                                                 const GValue           values[]);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_accessible_update_property_value    (GtkAccessible         *self,
+                                                                 int                    n_properties,
+                                                                 GtkAccessibleProperty  properties[],
+                                                                 const GValue           values[]);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_accessible_update_relation_value    (GtkAccessible         *self,
+                                                                 int                    n_relations,
+                                                                 GtkAccessibleRelation  relations[],
+                                                                 const GValue           values[]);
 
 GDK_AVAILABLE_IN_ALL
-GtkAccessibleRole gtk_accessible_get_accessible_role (GtkAccessible *self);
+void                    gtk_accessible_reset_state              (GtkAccessible         *self,
+                                                                 GtkAccessibleState     state);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_accessible_reset_property           (GtkAccessible         *self,
+                                                                 GtkAccessibleProperty  property);
+GDK_AVAILABLE_IN_ALL
+void                    gtk_accessible_reset_relation           (GtkAccessible         *self,
+                                                                 GtkAccessibleRelation  relation);
 
 GDK_AVAILABLE_IN_ALL
-void gtk_accessible_update_state (GtkAccessible      *self,
-                                  GtkAccessibleState  first_state,
-                                  ...);
+void                    gtk_accessible_state_init_value         (GtkAccessibleState     state,
+                                                                 GValue                *value);
 GDK_AVAILABLE_IN_ALL
-void gtk_accessible_update_property (GtkAccessible         *self,
-                                     GtkAccessibleProperty  first_property,
-                                     ...);
+void                    gtk_accessible_property_init_value      (GtkAccessibleProperty  property,
+                                                                 GValue                *value);
 GDK_AVAILABLE_IN_ALL
-void gtk_accessible_update_relation (GtkAccessible         *self,
-                                     GtkAccessibleRelation  first_relation,
-                                     ...);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_update_state_value (GtkAccessible      *self,
-                                        int                 n_states,
-                                        GtkAccessibleState  states[],
-                                        const GValue        values[]);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_update_property_value (GtkAccessible         *self,
-                                           int                    n_properties,
-                                           GtkAccessibleProperty  properties[],
-                                           const GValue           values[]);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_update_relation_value (GtkAccessible         *self,
-                                           int                    n_relations,
-                                           GtkAccessibleRelation  relations[],
-                                           const GValue           values[]);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_reset_state (GtkAccessible      *self,
-                                 GtkAccessibleState  state);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_reset_property (GtkAccessible         *self,
-                                    GtkAccessibleProperty  property);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_reset_relation (GtkAccessible         *self,
-                                    GtkAccessibleRelation  relation);
-
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_state_init_value (GtkAccessibleState  state,
-                                      GValue             *value);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_property_init_value (GtkAccessibleProperty  property,
-                                         GValue                *value);
-GDK_AVAILABLE_IN_ALL
-void gtk_accessible_relation_init_value (GtkAccessibleRelation  relation,
-                                         GValue                *value);
+void                    gtk_accessible_relation_init_value      (GtkAccessibleRelation  relation,
+                                                                 GValue                *value);
 
 G_END_DECLS

gtk/gtkaccessibleprivate.h

@@ -21,36 +21,21 @@
 #pragma once
 
 #include "gtkaccessible.h"
+#include "gtkatcontextprivate.h"
 
 G_BEGIN_DECLS
 
-/* < private >
- * GtkAccessiblePlatformChange:
- * @GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSABLE: whether the accessible has changed
- *   its focusable state
- * @GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSED: whether the accessible has changed its
- *   focused state
- * @GTK_ACCESSIBLE_PLATFORM_CHANGE_ACTIVE: whether the accessible has changed its
- *   active state
- *
- * Represents the various platform changes which can occur and are communicated
- * using [method@Gtk.Accessible.platform_changed].
- */
-typedef enum {
-  GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSABLE = 1 << GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSABLE,
-  GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSED   = 1 << GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED,
-  GTK_ACCESSIBLE_PLATFORM_CHANGE_ACTIVE    = 1 << GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE,
-} GtkAccessiblePlatformChange;
+struct _GtkAccessibleInterface
+{
+  GTypeInterface g_iface;
 
-typedef enum {
-  GTK_ACCESSIBLE_CHILD_STATE_ADDED,
-  GTK_ACCESSIBLE_CHILD_STATE_REMOVED
-} GtkAccessibleChildState;
+  GtkATContext *        (* get_at_context)      (GtkAccessible *self);
 
-typedef enum {
-  GTK_ACCESSIBLE_CHILD_CHANGE_ADDED   = 1 << GTK_ACCESSIBLE_CHILD_STATE_ADDED,
-  GTK_ACCESSIBLE_CHILD_CHANGE_REMOVED = 1 << GTK_ACCESSIBLE_CHILD_STATE_REMOVED
-} GtkAccessibleChildChange;
+  gboolean              (* get_platform_state)  (GtkAccessible              *self,
+                                                 GtkAccessiblePlatformState  state);
+};
+
+GtkATContext *  gtk_accessible_get_at_context   (GtkAccessible *self);
 
 const char *    gtk_accessible_role_to_name     (GtkAccessibleRole  role,
                                                  const char        *domain);
@@ -59,13 +44,15 @@ gboolean gtk_accessible_role_is_range_subclass (GtkAccessibleRole role);
 
 gboolean        gtk_accessible_should_present   (GtkAccessible     *self);
 
+void            gtk_accessible_platform_changed (GtkAccessible                *self,
+                                                 GtkAccessiblePlatformChange   change);
+gboolean        gtk_accessible_get_platform_state (GtkAccessible              *self,
+                                                   GtkAccessiblePlatformState  state);
+
+void            gtk_accessible_bounds_changed   (GtkAccessible *self);
+
 void            gtk_accessible_update_children  (GtkAccessible           *self,
                                                  GtkAccessible           *child,
                                                  GtkAccessibleChildState  state);
 
-void            gtk_accessible_bounds_changed   (GtkAccessible *self);
-
-void            gtk_accessible_platform_changed (GtkAccessible                *self,
-                                                 GtkAccessiblePlatformChange   change);
-
 G_END_DECLS

gtk/gtkapplication-wayland.c

@@ -104,13 +104,9 @@ gtk_application_impl_wayland_before_emit (GtkApplicationImpl *impl,
 {
   const char *startup_notification_id = NULL;
 
-  g_variant_lookup (platform_data, "activation-token", "&s", &startup_notification_id);
-  if (!startup_notification_id)
-    g_variant_lookup (platform_data, "desktop-startup-id", "&s", &startup_notification_id);
+  g_variant_lookup (platform_data, "desktop-startup-id", "&s", &startup_notification_id);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gdk_wayland_display_set_startup_notification_id (gdk_display_get_default (), startup_notification_id);
-G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static guint

gtk/gtkapplication-x11.c

@@ -87,9 +87,7 @@ gtk_application_impl_x11_before_emit (GtkApplicationImpl *impl,
 
   g_variant_lookup (platform_data, "desktop-startup-id", "&s", &startup_notification_id);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gdk_x11_display_set_startup_notification_id (gdk_display_get_default (), startup_notification_id);
-G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void

gtk/gtkapplication.c

@@ -321,16 +321,10 @@ gtk_application_add_platform_data (GApplication    *application,
     {
       const char *startup_id;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       startup_id = gdk_display_get_startup_notification_id (display);
-G_GNUC_END_IGNORE_DEPRECATIONS
       if (startup_id && g_utf8_validate (startup_id, -1, NULL))
-        {
-          g_variant_builder_add (builder, "{sv}", "activation-token",
-                                 g_variant_new_string (startup_id));
-          g_variant_builder_add (builder, "{sv}", "desktop-startup-id",
-                                 g_variant_new_string (startup_id));
-        }
+        g_variant_builder_add (builder, "{sv}", "desktop-startup-id",
+                               g_variant_new_string (startup_id));
     }
 }
 

gtk/gtkassistant.c

@@ -88,8 +88,6 @@
 #include "gtkstack.h"
 #include "gtktypebuiltins.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef struct _GtkAssistantPageClass   GtkAssistantPageClass;
 
 struct _GtkAssistantPage

gtk/gtkassistant.h

@@ -103,81 +103,81 @@ GDK_AVAILABLE_IN_ALL
 GType                 gtk_assistant_page_get_type         (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GType                 gtk_assistant_get_type              (void) G_GNUC_CONST;
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_assistant_new                   (void);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_next_page             (GtkAssistant         *assistant);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_previous_page         (GtkAssistant         *assistant);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 int                   gtk_assistant_get_current_page      (GtkAssistant         *assistant);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,
                                                            int                   page_num);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 int                   gtk_assistant_get_n_pages           (GtkAssistant         *assistant);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_assistant_get_nth_page          (GtkAssistant         *assistant,
                                                            int                   page_num);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 int                   gtk_assistant_prepend_page          (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 int                   gtk_assistant_append_page           (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 int                   gtk_assistant_insert_page           (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            int                   position);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_remove_page           (GtkAssistant         *assistant,
                                                            int                   page_num);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
                                                            GtkAssistantPageFunc  page_func,
                                                            gpointer              data,
                                                            GDestroyNotify        destroy);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_page_type         (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            GtkAssistantPageType  type);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            const char           *title);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 const char *         gtk_assistant_get_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
                                                            gboolean              complete);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 gboolean              gtk_assistant_get_page_complete     (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_add_action_widget     (GtkAssistant         *assistant,
                                                            GtkWidget            *child);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_remove_action_widget  (GtkAssistant         *assistant,
                                                            GtkWidget            *child);
 
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_update_buttons_state  (GtkAssistant *assistant);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_commit                (GtkAssistant *assistant);
 
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 GtkAssistantPage *    gtk_assistant_get_page       (GtkAssistant     *assistant,
                                                     GtkWidget        *child);
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_assistant_page_get_child (GtkAssistantPage *page);
 
-GDK_DEPRECATED_IN_4_10
+GDK_AVAILABLE_IN_ALL
 GListModel *          gtk_assistant_get_pages (GtkAssistant *assistant);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAssistant, g_object_unref)

gtk/gtkatcontextprivate.h

@@ -22,7 +22,6 @@
 
 #include "gtkatcontext.h"
 
-#include "gtkaccessibleprivate.h"
 #include "gtkaccessibleattributesetprivate.h"
 
 G_BEGIN_DECLS
@@ -81,6 +80,28 @@ typedef enum {
   GTK_ACCESSIBLE_STATE_CHANGE_SELECTED = 1 << GTK_ACCESSIBLE_STATE_SELECTED
 } GtkAccessibleStateChange;
 
+typedef enum {
+  GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSABLE,
+  GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED,
+  GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE
+} GtkAccessiblePlatformState;
+
+typedef enum {
+  GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSABLE = 1 << GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSABLE,
+  GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSED   = 1 << GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED,
+  GTK_ACCESSIBLE_PLATFORM_CHANGE_ACTIVE    = 1 << GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE,
+} GtkAccessiblePlatformChange;
+
+typedef enum {
+  GTK_ACCESSIBLE_CHILD_STATE_ADDED,
+  GTK_ACCESSIBLE_CHILD_STATE_REMOVED
+} GtkAccessibleChildState;
+
+typedef enum {
+  GTK_ACCESSIBLE_CHILD_CHANGE_ADDED   = 1 << GTK_ACCESSIBLE_CHILD_STATE_ADDED,
+  GTK_ACCESSIBLE_CHILD_CHANGE_REMOVED = 1 << GTK_ACCESSIBLE_CHILD_STATE_REMOVED
+} GtkAccessibleChildChange;
+
 struct _GtkATContext
 {
   GObject parent_instance;

gtk/gtkbuildable.c

@@ -80,7 +80,7 @@ gtk_buildable_set_buildable_id (GtkBuildable *buildable,
  * Gets the ID of the @buildable object.
  *
  * `GtkBuilder` sets the name based on the ID attribute
- * of the `<object>` tag used to construct the @buildable.
+ * of the <object> tag used to construct the @buildable.
  *
  * Returns: (nullable): the ID of the buildable object
  **/
@@ -193,7 +193,7 @@ gtk_buildable_construct_child (GtkBuildable *buildable,
  * @data: (out): return location for user data that will be passed in
  *   to parser functions
  *
- * This is called for each unknown element under `<child>`.
+ * This is called for each unknown element under <child>.
  *
  * Returns: %TRUE if an object has a custom implementation, %FALSE
  *   if it doesn't.

gtk/gtkbuildable.h

@@ -109,14 +109,14 @@ struct _GtkBuildableParser
  *  interface is created.
  * @construct_child: Constructs a child of a buildable that has been
  *  specified as “constructor” in the UI definition. This can be used to
- *  reference a widget created in a `<ui>` tag which is outside
+ *  reference a widget created in a <ui> tag which is outside
  *  of the normal GtkBuilder UI definition hierarchy.  A reference to the
  *  constructed object is returned and becomes owned by the caller.
  * @custom_tag_start: Implement this if the buildable needs to parse
- *  content below `<child>`. To handle an element, the implementation
+ *  content below <child>. To handle an element, the implementation
  *  must fill in the @parser and @user_data and return %TRUE.
  *  `GtkWidget` implements this to parse accessible attributes specified
- *  in `<accessibility>` elements.
+ *  in <accessibility> elements.
  *  Note that @user_data must be freed in @custom_tag_end or @custom_finished.
  * @custom_tag_end: Called for the end tag of each custom element that is
  *  handled by the buildable (see @custom_tag_start).

gtk/gtkbuilder.c

@@ -192,9 +192,9 @@
  *
  * Beyond this general structure, several object classes define their
  * own XML DTD fragments for filling in the ANY placeholders in the DTD
- * above. Note that a custom element in a `<child>` element gets parsed by
+ * above. Note that a custom element in a <child> element gets parsed by
  * the custom tag handler of the parent object, while a custom element in
- * an `<object>` element gets parsed by the custom tag handler of the object.
+ * an <object> element gets parsed by the custom tag handler of the object.
  *
  * These XML fragments are explained in the documentation of the
  * respective objects.

gtk/gtkbuilderscope.h

@@ -57,7 +57,7 @@ typedef enum { /*< prefix=GTK_BUILDER_CLOSURE >*/
  *   correct function name for registering the type and then use dlsym() to load it.
  *   The default implementation just tries g_type_from_name() and otherwise fails.
  * @get_type_from_function: Try to lookup a `GType` via the given function name, specified
- *   explicitly in a GtkBuilder file, like via the "type-func" attribute in the `<object>` tag.
+ *   explicitly in a GtkBuilder file, like via the "type-func" attribute in the "<object>" tag.
  *   This function is very rarely used.
  *   The C implementation will use dlsym() and call the resulting function as a `GTypeFunc`.
  *   The default implementation will fail and just return %G_TYPE_INVALID.

gtk/gtkcenterbox.c

@@ -37,7 +37,7 @@
  *
  * The `GtkCenterBox` implementation of the `GtkBuildable` interface
  * supports placing children in the 3 positions by specifying “start”, “center”
- * or “end” as the “type” attribute of a `<child>` element.
+ * or “end” as the “type” attribute of a <child> element.
  *
  * # CSS nodes
  *

gtk/gtkcomposetable.c

@@ -1325,7 +1325,9 @@ gtk_compose_table_check (const GtkComposeTable *table,
   if (n_compose == 1)
     return TRUE;
 
+  seq = NULL;
   match = FALSE;
+  value = 0;
 
   for (i = n_compose - 1; i < table->max_seq_len; i++)
     {

gtk/gtkcssanimatedstyle.c

@@ -937,12 +937,9 @@ gtk_css_animated_style_new_advance (GtkCssAnimatedStyle *source,
   gtk_internal_return_val_if_fail (GTK_IS_CSS_ANIMATED_STYLE (source), NULL);
   gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (base_style), NULL);
 
-  if (timestamp == 0)
+  if (timestamp == 0 || timestamp == source->current_time)
     return g_object_ref (source->style);
 
-  if (timestamp == source->current_time)
-    return g_object_ref (GTK_CSS_STYLE (source));
-
   gtk_internal_return_val_if_fail (timestamp > source->current_time, NULL);
 
   animations = NULL;

gtk/gtkcssprovider.c

@@ -1086,8 +1086,10 @@ gtk_css_provider_load_internal (GtkCssProvider *self,
 /**
  * gtk_css_provider_load_from_data:
  * @css_provider: a `GtkCssProvider`
- * @data: CSS data to be parsed
- * @length: the length of @data in bytes, or -1 for NUL terminated strings
+ * @data: (array length=length) (element-type guint8): CSS data loaded in memory
+ * @length: the length of @data in bytes, or -1 for NUL terminated strings. If
+ *   @length is not -1, the code will assume it is not NUL terminated and will
+ *   potentially do a copy.
  *
  * Loads @data into @css_provider.
  *

gtk/gtkdragicon.c

@@ -555,9 +555,6 @@ gtk_drag_icon_create_widget_for_value (const GValue *value)
       GtkWidget *image;
 
       info = g_file_query_info (G_FILE (g_value_get_object (value)), "standard::icon", 0, NULL, NULL);
-      if (!info)
-        return NULL;
-
       image = gtk_image_new_from_gicon (g_file_info_get_icon (info));
       gtk_widget_add_css_class (image, "large-icons");
       g_object_unref (info);