[mutter] wayland: Drop deprecated text input
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Drop deprecated text input
- Date: Wed, 5 Jan 2022 23:00:54 +0000 (UTC)
commit 12de68abf329b64729f3f17f18e5091e3f774e61
Author: Fernando Monteiro <fr02monteiro gmail com>
Date: Thu Sep 16 22:05:56 2021 +0100
wayland: Drop deprecated text input
This has been replaced for text-input-v3.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2185>
src/meson.build | 3 -
src/wayland/meta-wayland-seat.c | 12 -
src/wayland/meta-wayland-seat.h | 2 -
src/wayland/meta-wayland-text-input-legacy.c | 633 ---------------------------
src/wayland/meta-wayland-text-input-legacy.h | 43 --
src/wayland/meta-wayland-versions.h | 1 -
src/wayland/meta-wayland.c | 1 -
src/wayland/protocol/gtk-text-input.xml | 302 -------------
8 files changed, 997 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index ba2ef51555..43b28dc094 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -628,8 +628,6 @@ if have_wayland
'wayland/meta-wayland-tablet-tool.h',
'wayland/meta-wayland-text-input.c',
'wayland/meta-wayland-text-input.h',
- 'wayland/meta-wayland-text-input-legacy.c',
- 'wayland/meta-wayland-text-input-legacy.h',
'wayland/meta-wayland-touch.c',
'wayland/meta-wayland-touch.h',
'wayland/meta-wayland-types.h',
@@ -910,7 +908,6 @@ if have_wayland
wayland_protocols = [
['gtk-primary-selection', 'private', ],
['gtk-shell', 'private', ],
- ['gtk-text-input', 'private', ],
['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
['linux-dmabuf', 'unstable', 'v1', ],
['pointer-constraints', 'unstable', 'v1', ],
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 8f0f992f66..63c6b34abd 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -234,7 +234,6 @@ meta_wayland_seat_new (MetaWaylandCompositor *compositor,
NULL);
seat->text_input = meta_wayland_text_input_new (seat);
- seat->gtk_text_input = meta_wayland_gtk_text_input_new (seat);
meta_wayland_data_device_init (&seat->data_device);
meta_wayland_data_device_primary_init (&seat->primary_data_device);
@@ -277,7 +276,6 @@ meta_wayland_seat_free (MetaWaylandSeat *seat)
meta_wayland_touch_disable (seat->touch);
g_object_unref (seat->touch);
- meta_wayland_gtk_text_input_destroy (seat->gtk_text_input);
meta_wayland_text_input_destroy (seat->text_input);
g_free (seat);
@@ -388,8 +386,6 @@ meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
event->type == CLUTTER_TOUCH_BEGIN)
{
meta_wayland_text_input_handle_event (seat->text_input, event);
- meta_wayland_gtk_text_input_handle_event (seat->gtk_text_input,
- event);
}
switch (event->type)
@@ -410,10 +406,6 @@ meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
if (meta_wayland_text_input_handle_event (seat->text_input, event))
return TRUE;
- if (meta_wayland_gtk_text_input_handle_event (seat->gtk_text_input,
- event))
- return TRUE;
-
if (meta_wayland_seat_has_keyboard (seat))
return meta_wayland_keyboard_handle_event (seat->keyboard,
(const ClutterKeyEvent *) event);
@@ -430,9 +422,6 @@ meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
case CLUTTER_IM_PREEDIT:
if (meta_wayland_text_input_handle_event (seat->text_input, event))
return TRUE;
- if (meta_wayland_gtk_text_input_handle_event (seat->gtk_text_input,
- event))
- return TRUE;
break;
default:
@@ -461,7 +450,6 @@ meta_wayland_seat_set_input_focus (MetaWaylandSeat *seat,
meta_wayland_tablet_seat_set_pad_focus (tablet_seat, surface);
meta_wayland_text_input_set_focus (seat->text_input, surface);
- meta_wayland_gtk_text_input_set_focus (seat->gtk_text_input, surface);
}
gboolean
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index ae4e1076b4..7f8b087ec1 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -33,7 +33,6 @@
#include "wayland/meta-wayland-pointer.h"
#include "wayland/meta-wayland-tablet-tool.h"
#include "wayland/meta-wayland-text-input.h"
-#include "wayland/meta-wayland-text-input-legacy.h"
#include "wayland/meta-wayland-touch.h"
#include "wayland/meta-wayland-types.h"
@@ -50,7 +49,6 @@ struct _MetaWaylandSeat
MetaWaylandDataDevicePrimary primary_data_device;
MetaWaylandDataDevicePrimaryLegacy primary_legacy_data_device;
- MetaWaylandGtkTextInput *gtk_text_input;
MetaWaylandTextInput *text_input;
guint capabilities;
diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h
index 8079543039..598bdd2e57 100644
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -50,7 +50,6 @@
#define META_ZWP_KEYBOARD_SHORTCUTS_INHIBIT_V1_VERSION 1
#define META_ZXDG_OUTPUT_V1_VERSION 3
#define META_ZWP_XWAYLAND_KEYBOARD_GRAB_V1_VERSION 1
-#define META_GTK_TEXT_INPUT_VERSION 1
#define META_ZWP_TEXT_INPUT_V3_VERSION 1
#define META_WP_VIEWPORTER_VERSION 1
#define META_GTK_PRIMARY_SELECTION_VERSION 1
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index f8b3645f7d..5adc5d9883 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_keyboard_shortcuts_inhibit_init (compositor);
meta_wayland_surface_inhibit_shortcuts_dialog_init ();
meta_wayland_text_input_init (compositor);
- meta_wayland_gtk_text_input_init (compositor);
meta_wayland_init_presentation_time (compositor);
meta_wayland_activation_init (compositor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]