From da6c0f3ecbfda6223001212fc27cff2e617135f6 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 12 Oct 2020 16:40:19 +0100 Subject: [PATCH 1/7] Move private GdkSurface Wayland API into its own header This allows us to hide private API from installed headers, documentation, and introspection. --- gdk/wayland/gdksurface-wayland.c | 10 ++++---- gdk/wayland/gdksurface-wayland.h | 40 ++++++++++++++++++++++++++++++++ gdk/wayland/gdkwaylandsurface.h | 14 ----------- gtk/gtkapplication-wayland.c | 1 + gtk/gtkwindow.c | 1 + 5 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 gdk/wayland/gdksurface-wayland.h diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index 0d8fe2fe74..bb78d49730 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -17,12 +17,7 @@ #include "config.h" -#include -#include - -#include "gdk.h" -#include "gdkwayland.h" -#include "gdkwaylandsurface.h" +#include "gdksurface-wayland.h" #include "gdkdeviceprivate.h" #include "gdkdisplay-wayland.h" @@ -45,6 +40,9 @@ #include #include +#include +#include + #define SURFACE_IS_TOPLEVEL(surface) TRUE #define MAX_WL_BUFFER_SIZE (4083) /* 4096 minus header, string argument length and NUL byte */ diff --git a/gdk/wayland/gdksurface-wayland.h b/gdk/wayland/gdksurface-wayland.h new file mode 100644 index 0000000000..1ca3877a46 --- /dev/null +++ b/gdk/wayland/gdksurface-wayland.h @@ -0,0 +1,40 @@ +/* gdksurface-wayland.h: Private header for GdkWaylandSurface + * + * Copyright 2020 GNOME Foundation + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * 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 . + */ + +#pragma once + +#include "gdkwaylandsurface.h" + +G_BEGIN_DECLS + +void gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel, + const char *application_id, + const char *app_menu_path, + const char *menubar_path, + const char *window_object_path, + const char *application_object_path, + const char *unique_bus_name); + +void gdk_wayland_toplevel_announce_csd (GdkToplevel *toplevel); + +gboolean gdk_wayland_toplevel_inhibit_idle (GdkToplevel *toplevel); +void gdk_wayland_toplevel_uninhibit_idle (GdkToplevel *toplevel); + +G_END_DECLS diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h index 7fd45c519d..851a4d5607 100644 --- a/gdk/wayland/gdkwaylandsurface.h +++ b/gdk/wayland/gdkwaylandsurface.h @@ -62,15 +62,6 @@ GType gdk_wayland_popup_get_type (void); GDK_AVAILABLE_IN_ALL struct wl_surface *gdk_wayland_surface_get_wl_surface (GdkSurface *surface); -GDK_AVAILABLE_IN_ALL -void gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel, - const char *application_id, - const char *app_menu_path, - const char *menubar_path, - const char *window_object_path, - const char *application_object_path, - const char *unique_bus_name); - typedef void (*GdkWaylandToplevelExported) (GdkToplevel *toplevel, const char *handle, gpointer user_data); @@ -92,11 +83,6 @@ GDK_AVAILABLE_IN_ALL void gdk_wayland_toplevel_set_application_id (GdkToplevel *toplevel, const char *application_id); -void gdk_wayland_toplevel_announce_csd (GdkToplevel *toplevel); - -gboolean gdk_wayland_toplevel_inhibit_idle (GdkToplevel *toplevel); -void gdk_wayland_toplevel_uninhibit_idle (GdkToplevel *toplevel); - G_END_DECLS #endif /* __GDK_WAYLAND_SURFACE_H__ */ diff --git a/gtk/gtkapplication-wayland.c b/gtk/gtkapplication-wayland.c index 5b175a8ba2..a892f4be4b 100644 --- a/gtk/gtkapplication-wayland.c +++ b/gtk/gtkapplication-wayland.c @@ -26,6 +26,7 @@ #include #include +#include #include typedef struct diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index a6f7f37912..1edcd5760b 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -88,6 +88,7 @@ #ifdef GDK_WINDOWING_WAYLAND #include "wayland/gdkwayland.h" +#include "wayland/gdksurface-wayland.h" #endif #ifdef GDK_WINDOWING_BROADWAY From 38304fc138cb5202e802c83f3cd6b82c74df0eb8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 12 Oct 2020 16:44:05 +0100 Subject: [PATCH 2/7] Hide gdk_wayland_display_prefers_ssd() The function is not exported, so it should not be in a public header. --- gdk/wayland/gdkdisplay-wayland.c | 2 +- gdk/wayland/gdkdisplay-wayland.h | 2 ++ gdk/wayland/gdkwaylanddisplay.h | 2 -- gtk/gtkwindow.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index b2c182a884..c37ce3d4d0 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -384,7 +384,7 @@ static const struct org_kde_kwin_server_decoration_manager_listener server_decor .default_mode = server_decoration_manager_default_mode }; -/** +/* * gdk_wayland_display_prefers_ssd: * @display: (type GdkWaylandDisplay): a #GdkDisplay * diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h index 49794d159e..886210ef3c 100644 --- a/gdk/wayland/gdkdisplay-wayland.h +++ b/gdk/wayland/gdkdisplay-wayland.h @@ -165,6 +165,8 @@ struct _GdkWaylandDisplayClass GdkDisplayClass parent_class; }; +gboolean gdk_wayland_display_prefers_ssd (GdkDisplay *display); + G_END_DECLS #endif /* __GDK_WAYLAND_DISPLAY__ */ diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h index f5d955f20f..0e3249dfb5 100644 --- a/gdk/wayland/gdkwaylanddisplay.h +++ b/gdk/wayland/gdkwaylanddisplay.h @@ -59,8 +59,6 @@ GDK_AVAILABLE_IN_ALL void gdk_wayland_display_set_startup_notification_id (GdkDisplay *display, const char *startup_id); -gboolean gdk_wayland_display_prefers_ssd (GdkDisplay *display); - GDK_AVAILABLE_IN_ALL gboolean gdk_wayland_display_query_registry (GdkDisplay *display, const char *global); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 1edcd5760b..d013bea14a 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -88,6 +88,7 @@ #ifdef GDK_WINDOWING_WAYLAND #include "wayland/gdkwayland.h" +#include "wayland/gdkdisplay-wayland.h" #include "wayland/gdksurface-wayland.h" #endif From 4f316f3249962cee324e6939f67c5e5c35d6dc20 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 12 Oct 2020 16:44:36 +0100 Subject: [PATCH 3/7] docs: Remove private GdkWayland API from the reference --- docs/reference/gdk/gdk4-sections.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 4c2b0dc3b2..32f36749e2 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -961,7 +961,6 @@ gdk_wayland_display_query_registry gdk_wayland_display_set_cursor_theme gdk_wayland_display_get_startup_notification_id gdk_wayland_display_set_startup_notification_id -gdk_wayland_display_prefers_ssd gdk_wayland_display_query_registry @@ -982,9 +981,6 @@ gdk_wayland_toplevel_export_handle gdk_wayland_toplevel_unexport_handle gdk_wayland_toplevel_set_transient_for_exported gdk_wayland_toplevel_set_application_id -gdk_wayland_toplevel_announce_csd -gdk_wayland_toplevel_inhibit_idle -gdk_wayland_toplevel_uninhibit_idle GDK_TYPE_WAYLAND_DEVICE From 13aa053f6bc15fab11548b5b161cf66ed6585212 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 12 Oct 2020 16:49:10 +0100 Subject: [PATCH 4/7] Rename libgtk_only symbol in GdkWaylandToplevel All public non-exported symbols in GDK can be used by GTK. --- gdk/wayland/gdksurface-wayland.c | 14 +++++++------- gdk/wayland/gdksurface-wayland.h | 20 ++++++++++---------- gtk/gtkapplication-wayland.c | 10 +++++++--- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index bb78d49730..ba5abff750 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -4168,13 +4168,13 @@ maybe_set_gtk_surface_dbus_properties (GdkWaylandSurface *impl) } void -gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel, - const char *application_id, - const char *app_menu_path, - const char *menubar_path, - const char *window_object_path, - const char *application_object_path, - const char *unique_bus_name) +gdk_wayland_toplevel_set_dbus_properties (GdkToplevel *toplevel, + const char *application_id, + const char *app_menu_path, + const char *menubar_path, + const char *window_object_path, + const char *application_object_path, + const char *unique_bus_name) { GdkWaylandSurface *impl; diff --git a/gdk/wayland/gdksurface-wayland.h b/gdk/wayland/gdksurface-wayland.h index 1ca3877a46..b0d0d6fc19 100644 --- a/gdk/wayland/gdksurface-wayland.h +++ b/gdk/wayland/gdksurface-wayland.h @@ -24,17 +24,17 @@ G_BEGIN_DECLS -void gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel, - const char *application_id, - const char *app_menu_path, - const char *menubar_path, - const char *window_object_path, - const char *application_object_path, - const char *unique_bus_name); +void gdk_wayland_toplevel_set_dbus_properties (GdkToplevel *toplevel, + const char *application_id, + const char *app_menu_path, + const char *menubar_path, + const char *window_object_path, + const char *application_object_path, + const char *unique_bus_name); -void gdk_wayland_toplevel_announce_csd (GdkToplevel *toplevel); +void gdk_wayland_toplevel_announce_csd (GdkToplevel *toplevel); -gboolean gdk_wayland_toplevel_inhibit_idle (GdkToplevel *toplevel); -void gdk_wayland_toplevel_uninhibit_idle (GdkToplevel *toplevel); +gboolean gdk_wayland_toplevel_inhibit_idle (GdkToplevel *toplevel); +void gdk_wayland_toplevel_uninhibit_idle (GdkToplevel *toplevel); G_END_DECLS diff --git a/gtk/gtkapplication-wayland.c b/gtk/gtkapplication-wayland.c index a892f4be4b..76fa144751 100644 --- a/gtk/gtkapplication-wayland.c +++ b/gtk/gtkapplication-wayland.c @@ -84,9 +84,13 @@ gtk_application_impl_wayland_handle_window_realize (GtkApplicationImpl *impl, window_path = gtk_application_impl_dbus_get_window_path (dbus, window); - gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GDK_TOPLEVEL (gdk_surface), - dbus->application_id, dbus->app_menu_path, dbus->menubar_path, - window_path, dbus->object_path, dbus->unique_name); + gdk_wayland_toplevel_set_dbus_properties (GDK_TOPLEVEL (gdk_surface), + dbus->application_id, + dbus->app_menu_path, + dbus->menubar_path, + window_path, + dbus->object_path, + dbus->unique_name); g_free (window_path); From da007ac97b2e504ce70a5e95fca27bc6489e4850 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 14 Oct 2020 11:55:34 +0100 Subject: [PATCH 5/7] Add a public header for GdkWaylandSeat We have public API requiring it as a type. --- gdk/wayland/gdkseat-wayland.h | 11 ++------ gdk/wayland/gdkwayland.h | 1 + gdk/wayland/gdkwaylanddevice.h | 4 +-- gdk/wayland/gdkwaylandseat.h | 49 ++++++++++++++++++++++++++++++++++ gdk/wayland/meson.build | 3 ++- 5 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 gdk/wayland/gdkwaylandseat.h diff --git a/gdk/wayland/gdkseat-wayland.h b/gdk/wayland/gdkseat-wayland.h index 711c597ae9..5780f2003b 100644 --- a/gdk/wayland/gdkseat-wayland.h +++ b/gdk/wayland/gdkseat-wayland.h @@ -22,25 +22,18 @@ #include "config.h" -#include +#include "gdkwaylandseat.h" +#include "gdk/gdkseatprivate.h" -#define GDK_TYPE_WAYLAND_SEAT (gdk_wayland_seat_get_type ()) -#define GDK_WAYLAND_SEAT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeat)) #define GDK_WAYLAND_SEAT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeatClass)) -#define GDK_IS_WAYLAND_SEAT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_WAYLAND_SEAT)) #define GDK_IS_WAYLAND_SEAT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_WAYLAND_SEAT)) #define GDK_WAYLAND_SEAT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeatClass)) -typedef struct _GdkWaylandSeat GdkWaylandSeat; -typedef struct _GdkWaylandSeatClass GdkWaylandSeatClass; - struct _GdkWaylandSeatClass { GdkSeatClass parent_class; }; -GType gdk_wayland_seat_get_type (void) G_GNUC_CONST; - void gdk_wayland_seat_update_cursor_scale (GdkWaylandSeat *seat); void gdk_wayland_seat_clear_touchpoints (GdkWaylandSeat *seat, diff --git a/gdk/wayland/gdkwayland.h b/gdk/wayland/gdkwayland.h index 9179d58e77..4e7981a229 100644 --- a/gdk/wayland/gdkwayland.h +++ b/gdk/wayland/gdkwayland.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h index f92e19384a..577f3bbf24 100644 --- a/gdk/wayland/gdkwaylanddevice.h +++ b/gdk/wayland/gdkwaylanddevice.h @@ -33,6 +33,7 @@ typedef struct _GdkWaylandDevice GdkWaylandDevice; #else typedef GdkDevice GdkWaylandDevice; #endif + typedef struct _GdkWaylandDeviceClass GdkWaylandDeviceClass; #define GDK_TYPE_WAYLAND_DEVICE (gdk_wayland_device_get_type ()) @@ -52,9 +53,6 @@ struct wl_pointer *gdk_wayland_device_get_wl_pointer (GdkDevice *device); GDK_AVAILABLE_IN_ALL struct wl_keyboard *gdk_wayland_device_get_wl_keyboard (GdkDevice *device); -GDK_AVAILABLE_IN_ALL -struct wl_seat *gdk_wayland_seat_get_wl_seat (GdkSeat *seat); - GDK_AVAILABLE_IN_ALL const char *gdk_wayland_device_get_node_path (GdkDevice *device); diff --git a/gdk/wayland/gdkwaylandseat.h b/gdk/wayland/gdkwaylandseat.h new file mode 100644 index 0000000000..ab7afb3527 --- /dev/null +++ b/gdk/wayland/gdkwaylandseat.h @@ -0,0 +1,49 @@ +/* gdkwaylandseat.h: Wayland GdkSeat + * + * Copyright 2020 GNOME Foundation + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * 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 . + */ +#pragma once + +#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + +#include +#include + +G_BEGIN_DECLS + +#ifdef GTK_COMPILATION +typedef struct _GdkWaylandSeat GdkWaylandSeat; +#else +typedef GdkSeat GdkWaylandSeat; +#endif + +typedef struct _GdkWaylandSeatClass GdkWaylandSeatClass; + +#define GDK_TYPE_WAYLAND_SEAT (gdk_wayland_seat_get_type ()) +#define GDK_WAYLAND_SEAT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_WAYLAND_SEAT, GdkWaylandSeat)) +#define GDK_IS_WAYLAND_SEAT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_WAYLAND_SEAT)) + +GDK_AVAILABLE_IN_ALL +GType gdk_wayland_seat_get_type (void) G_GNUC_CONST; + +GDK_AVAILABLE_IN_ALL +struct wl_seat * gdk_wayland_seat_get_wl_seat (GdkSeat *seat); + +G_END_DECLS diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index 4217eb2a93..4d5f3ea5cc 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -24,7 +24,8 @@ gdk_wayland_public_headers = files([ 'gdkwaylanddisplay.h', 'gdkwaylandglcontext.h', 'gdkwaylandmonitor.h', - 'gdkwaylandsurface.h' + 'gdkwaylandseat.h', + 'gdkwaylandsurface.h', ]) install_headers(gdk_wayland_public_headers, 'gdkwayland.h', subdir: 'gtk-4.0/gdk/wayland/') From 937719210228ab653992985c31fa32107fe1c5b8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 14 Oct 2020 11:57:06 +0100 Subject: [PATCH 6/7] Correctly annotate gdk_wayland_seat_get_wl_seat() We expect a `GdkWaylandSeat` as the instance parameter. --- gdk/wayland/gdkdevice-wayland.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 1fb60eadf8..cd77fa75f2 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -5013,11 +5013,11 @@ gdk_wayland_device_set_selection (GdkDevice *gdk_device, /** * gdk_wayland_seat_get_wl_seat: (skip) - * @seat: a #GdkSeat + * @seat: (type GdkWaylandSeat): a #GdkSeat * - * Returns the Wayland wl_seat of a #GdkSeat. + * Returns the Wayland `wl_seat` of a #GdkSeat. * - * Returns: (transfer none): a Wayland wl_seat + * Returns: (transfer none): a Wayland `wl_seat` */ struct wl_seat * gdk_wayland_seat_get_wl_seat (GdkSeat *seat) From 1d40f297760b3965a1462489c6a4b5adfb57f095 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 15 Oct 2020 12:00:00 -0400 Subject: [PATCH 7/7] wayland: Make gdk_wayland_device_pad_set_feedback private It is not a generally useful api, and awkwardly named. --- docs/reference/gdk/gdk4-sections.txt | 1 - gdk/wayland/gdkdevice-wayland-private.h | 16 ++++++++++------ gdk/wayland/gdkdevice-wayland.c | 2 +- gdk/wayland/gdkwaylanddevice.h | 6 ------ gtk/gtkpadcontroller.c | 1 + 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 32f36749e2..9373f948f3 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -969,7 +969,6 @@ gdk_wayland_device_get_wl_seat gdk_wayland_device_get_wl_pointer gdk_wayland_device_get_wl_keyboard gdk_wayland_device_get_node_ath -gdk_wayland_device_pad_set_feedback gdk_wayland_monitor_get_wl_output diff --git a/gdk/wayland/gdkdevice-wayland-private.h b/gdk/wayland/gdkdevice-wayland-private.h index 3dae422081..b22a4f3814 100644 --- a/gdk/wayland/gdkdevice-wayland-private.h +++ b/gdk/wayland/gdkdevice-wayland-private.h @@ -3,11 +3,15 @@ #include "gdkwaylanddevice.h" -void -gdk_wayland_device_query_state (GdkDevice *device, - GdkSurface *surface, - double *win_x, - double *win_y, - GdkModifierType *mask); +void gdk_wayland_device_query_state (GdkDevice *device, + GdkSurface *surface, + double *win_x, + double *win_y, + GdkModifierType *mask); + +void gdk_wayland_device_pad_set_feedback (GdkDevice *device, + GdkDevicePadFeature feature, + guint feature_idx, + const char *label); #endif diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index cd77fa75f2..8671561175 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -5064,7 +5064,7 @@ gdk_wayland_device_get_node_path (GdkDevice *device) return NULL; } -/** +/* * gdk_wayland_device_pad_set_feedback: * @device: (type GdkWaylandDevice): a %GDK_SOURCE_TABLET_PAD device * @feature: Feature to set the feedback label for diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h index 577f3bbf24..fbd51b6fe1 100644 --- a/gdk/wayland/gdkwaylanddevice.h +++ b/gdk/wayland/gdkwaylanddevice.h @@ -56,12 +56,6 @@ struct wl_keyboard *gdk_wayland_device_get_wl_keyboard (GdkDevice *device); GDK_AVAILABLE_IN_ALL const char *gdk_wayland_device_get_node_path (GdkDevice *device); -GDK_AVAILABLE_IN_ALL -void gdk_wayland_device_pad_set_feedback (GdkDevice *device, - GdkDevicePadFeature feature, - guint feature_idx, - const char *label); - G_END_DECLS #endif /* __GDK_WAYLAND_DEVICE_H__ */ diff --git a/gtk/gtkpadcontroller.c b/gtk/gtkpadcontroller.c index dbda9027cd..c4871aa981 100644 --- a/gtk/gtkpadcontroller.c +++ b/gtk/gtkpadcontroller.c @@ -77,6 +77,7 @@ #ifdef GDK_WINDOWING_WAYLAND #include +#include "gdk/wayland/gdkdevice-wayland-private.h" #endif struct _GtkPadController {