From d59a4e7a779dd8bd5cea1e0ec18ce2c326dffbd1 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 31 Jul 2023 16:32:28 +0200 Subject: wayland: xdg-activation is now always available Since we're requiring wayland-protocols >= 1.32 --- wayland.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'wayland.h') diff --git a/wayland.h b/wayland.h index 275338a8..c200e79f 100644 --- a/wayland.h +++ b/wayland.h @@ -15,10 +15,7 @@ #include #include #include - -#if defined(HAVE_XDG_ACTIVATION) - #include -#endif +#include #if defined(HAVE_FRACTIONAL_SCALE) #include @@ -345,7 +342,6 @@ struct wl_url { enum csd_mode {CSD_UNKNOWN, CSD_NO, CSD_YES}; -#if defined(HAVE_XDG_ACTIVATION) typedef void (*activation_token_cb_t)(const char *token, void *data); /* @@ -359,7 +355,6 @@ struct xdg_activation_token_context { activation_token_cb_t cb; /* User provided callback */ void *cb_data; /* Callback user pointer */ }; -#endif struct wayland; struct wl_window { @@ -367,10 +362,10 @@ struct wl_window { struct wayl_surface surface; struct xdg_surface *xdg_surface; struct xdg_toplevel *xdg_toplevel; -#if defined(HAVE_XDG_ACTIVATION) + tll(struct xdg_activation_token_context *) xdg_tokens; bool urgency_token_is_pending; -#endif + #if defined(HAVE_FRACTIONAL_SCALE) struct wp_fractional_scale_v1 *fractional_scale; #endif @@ -451,9 +446,7 @@ struct wayland { struct wl_data_device_manager *data_device_manager; struct zwp_primary_selection_device_manager_v1 *primary_selection_device_manager; -#if defined(HAVE_XDG_ACTIVATION) struct xdg_activation_v1 *xdg_activation; -#endif #if defined(HAVE_CURSOR_SHAPE) struct wp_cursor_shape_manager_v1 *cursor_shape_manager; @@ -515,8 +508,6 @@ bool wayl_win_subsurface_new_with_custom_parent( struct wayl_sub_surface *surf, bool allow_pointer_input); void wayl_win_subsurface_destroy(struct wayl_sub_surface *surf); -#if defined(HAVE_XDG_ACTIVATION) bool wayl_get_activation_token( struct wayland *wayl, struct seat *seat, uint32_t serial, struct wl_window *win, activation_token_cb_t cb, void *cb_data); -#endif -- cgit v1.3