[mutter] wayland: Remove Gtk primary selection protocol
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Remove Gtk primary selection protocol
- Date: Wed, 18 May 2022 21:03:37 +0000 (UTC)
commit d4bdd8b56f259da9292b97292f91f497d3d934f6
Author: Fernando Monteiro <fr02monteiro gmail com>
Date: Thu Sep 16 23:34:24 2021 +0100
wayland: Remove Gtk primary selection protocol
This has been replaced for primary selection protocol from
wayland-protocols.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2184>
.gitignore | 2 -
src/meson.build | 7 -
.../meta-wayland-data-device-primary-legacy.c | 359 ---------------------
.../meta-wayland-data-device-primary-legacy.h | 55 ----
.../meta-wayland-data-offer-primary-legacy.c | 139 --------
.../meta-wayland-data-offer-primary-legacy.h | 31 --
.../meta-wayland-data-source-primary-legacy.c | 117 -------
.../meta-wayland-data-source-primary-legacy.h | 37 ---
src/wayland/meta-wayland-seat.c | 3 -
src/wayland/meta-wayland-seat.h | 2 -
src/wayland/meta-wayland-types.h | 1 -
src/wayland/meta-wayland-versions.h | 1 -
src/wayland/meta-wayland.c | 1 -
src/wayland/protocol/gtk-primary-selection.xml | 225 -------------
14 files changed, 980 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5e7a32697..db490f34c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,8 +52,6 @@ src/meta-dbus-idle-monitor.[ch]
src/meta-dbus-login1.[ch]
src/meta-dbus-remote-desktop.[ch]
src/meta-dbus-screen-cast.[ch]
-src/gtk-primary-selection-protocol.c
-src/gtk-primary-selection-server-protocol.h
src/gtk-shell-protocol.c
src/gtk-shell-server-protocol.h
src/pointer-gestures-unstable-v*-protocol.c
diff --git a/src/meson.build b/src/meson.build
index 8f7f6f4353..14a8a986a3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -550,20 +550,14 @@ if have_wayland
'wayland/meta-wayland-data-device.h',
'wayland/meta-wayland-data-device-primary.c',
'wayland/meta-wayland-data-device-primary.h',
- 'wayland/meta-wayland-data-device-primary-legacy.c',
- 'wayland/meta-wayland-data-device-primary-legacy.h',
'wayland/meta-wayland-data-offer.c',
'wayland/meta-wayland-data-offer.h',
'wayland/meta-wayland-data-offer-primary.c',
'wayland/meta-wayland-data-offer-primary.h',
- 'wayland/meta-wayland-data-offer-primary-legacy.c',
- 'wayland/meta-wayland-data-offer-primary-legacy.h',
'wayland/meta-wayland-data-source.c',
'wayland/meta-wayland-data-source.h',
'wayland/meta-wayland-data-source-primary.c',
'wayland/meta-wayland-data-source-primary.h',
- 'wayland/meta-wayland-data-source-primary-legacy.c',
- 'wayland/meta-wayland-data-source-primary-legacy.h',
'wayland/meta-wayland-dma-buf.c',
'wayland/meta-wayland-dma-buf.h',
'wayland/meta-wayland-dnd-surface.c',
@@ -906,7 +900,6 @@ if have_wayland
# - protocol stability ('private', 'stable' or 'unstable')
# - protocol version (if stability is 'unstable')
wayland_protocols = [
- ['gtk-primary-selection', 'private', ],
['gtk-shell', 'private', ],
['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
['linux-dmabuf', 'unstable', 'v1', ],
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index f7a2aeddc1..80325ece10 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -24,7 +24,6 @@
#include "wayland/meta-wayland-seat.h"
#include "wayland/meta-wayland-data-device.h"
-#include "wayland/meta-wayland-data-device-primary-legacy.h"
#include "wayland/meta-wayland-private.h"
#include "wayland/meta-wayland-tablet-seat.h"
#include "wayland/meta-wayland-versions.h"
@@ -225,7 +224,6 @@ meta_wayland_seat_new (MetaWaylandCompositor *compositor,
meta_wayland_data_device_init (&seat->data_device);
meta_wayland_data_device_primary_init (&seat->primary_data_device);
- meta_wayland_data_device_primary_legacy_init (&seat->primary_legacy_data_device);
clutter_seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
meta_wayland_seat_update_capabilities (seat, clutter_seat);
@@ -423,7 +421,6 @@ meta_wayland_seat_set_input_focus (MetaWaylandSeat *seat,
meta_wayland_keyboard_set_focus (seat->keyboard, surface);
meta_wayland_data_device_set_keyboard_focus (&seat->data_device);
meta_wayland_data_device_primary_set_keyboard_focus (&seat->primary_data_device);
- meta_wayland_data_device_primary_legacy_set_keyboard_focus (&seat->primary_legacy_data_device);
}
tablet_seat = meta_wayland_tablet_manager_ensure_seat (compositor->tablet_manager, seat);
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index 7f8b087ec1..f23ff50bdf 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -27,7 +27,6 @@
#include "clutter/clutter.h"
#include "wayland/meta-wayland-data-device.h"
#include "wayland/meta-wayland-data-device-primary.h"
-#include "wayland/meta-wayland-data-device-primary-legacy.h"
#include "wayland/meta-wayland-input-device.h"
#include "wayland/meta-wayland-keyboard.h"
#include "wayland/meta-wayland-pointer.h"
@@ -47,7 +46,6 @@ struct _MetaWaylandSeat
MetaWaylandDataDevice data_device;
MetaWaylandDataDevicePrimary primary_data_device;
- MetaWaylandDataDevicePrimaryLegacy primary_legacy_data_device;
MetaWaylandTextInput *text_input;
diff --git a/src/wayland/meta-wayland-types.h b/src/wayland/meta-wayland-types.h
index b2c8615a55..81cd898751 100644
--- a/src/wayland/meta-wayland-types.h
+++ b/src/wayland/meta-wayland-types.h
@@ -38,7 +38,6 @@ typedef struct _MetaWaylandDragDestFuncs MetaWaylandDragDestFuncs;
typedef struct _MetaWaylandDataOffer MetaWaylandDataOffer;
typedef struct _MetaWaylandDataDevice MetaWaylandDataDevice;
typedef struct _MetaWaylandDataDevicePrimary MetaWaylandDataDevicePrimary;
-typedef struct _MetaWaylandDataDevicePrimaryLegacy MetaWaylandDataDevicePrimaryLegacy;
typedef struct _MetaWaylandTabletManager MetaWaylandTabletManager;
typedef struct _MetaWaylandTabletSeat MetaWaylandTabletSeat;
diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h
index 57d2e15d71..bb6b2c40d2 100644
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -51,7 +51,6 @@
#define META_ZWP_XWAYLAND_KEYBOARD_GRAB_V1_VERSION 1
#define META_ZWP_TEXT_INPUT_V3_VERSION 1
#define META_WP_VIEWPORTER_VERSION 1
-#define META_GTK_PRIMARY_SELECTION_VERSION 1
#define META_ZWP_PRIMARY_SELECTION_V1_VERSION 1
#define META_WP_PRESENTATION_VERSION 1
#define META_XDG_ACTIVATION_V1_VERSION 1
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 856b819cd8..afea5e875c 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -606,7 +606,6 @@ meta_wayland_compositor_new (MetaContext *context)
meta_wayland_outputs_init (compositor);
meta_wayland_data_device_manager_init (compositor);
meta_wayland_data_device_primary_manager_init (compositor);
- meta_wayland_data_device_primary_legacy_manager_init (compositor);
meta_wayland_subsurfaces_init (compositor);
meta_wayland_shell_init (compositor);
meta_wayland_pointer_gestures_init (compositor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]