isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Enable negative offsets in delete surrounding text

Browse Source 
The input method can assign a negative value to
clutter_input_method_delete_surrounding() to move the cursor to the left.
But Wayland protocol accepts positive values in delete_surrounding() and
GTK converts the values to the negative ones in
text_input_delete_surrounding_text_apply().

https://gitlab.gnome.org/GNOME/mutter/issues/539
This commit is contained in:
Takao Fujiwara 2019-08-15 18:47:03 +09:00 committed by Carlos Garnacho
parent 9f31e7252c
commit 2cfdbbd730
8 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter/clutter-input-focus-private.h
View File

@ -29,7 +29,7 @@ void clutter_input_focus_focus_out (ClutterInputFocus *focus);
void clutter_input_focus_commit (ClutterInputFocus *focus, void clutter_input_focus_commit (ClutterInputFocus *focus,
const gchar *text); const gchar *text);
void clutter_input_focus_delete_surrounding (ClutterInputFocus *focus, void clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
guint offset, int offset,
guint len); guint len);
void clutter_input_focus_request_surrounding (ClutterInputFocus *focus); void clutter_input_focus_request_surrounding (ClutterInputFocus *focus);

2
clutter/clutter/clutter-input-focus.c
View File

@ -217,7 +217,7 @@ clutter_input_focus_commit (ClutterInputFocus *focus,
void void
clutter_input_focus_delete_surrounding (ClutterInputFocus *focus, clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
guint offset, int offset,
guint len) guint len)
{ {
g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus)); g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));

2
clutter/clutter/clutter-input-focus.h
View File

@ -41,7 +41,7 @@ struct _ClutterInputFocusClass
void (* request_surrounding) (ClutterInputFocus *focus); void (* request_surrounding) (ClutterInputFocus *focus);
void (* delete_surrounding) (ClutterInputFocus *focus, void (* delete_surrounding) (ClutterInputFocus *focus,
guint offset, int offset,
guint len); guint len);
void (* commit_text) (ClutterInputFocus *focus, void (* commit_text) (ClutterInputFocus *focus,
const gchar *text); const gchar *text);

4
clutter/clutter/clutter-input-method.c
View File

@ -168,7 +168,7 @@ clutter_input_method_class_init (ClutterInputMethodClass *klass)
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, NULL, NULL, NULL, 0, NULL, NULL, NULL,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_UINT);
signals[REQUEST_SURROUNDING] = signals[REQUEST_SURROUNDING] =
g_signal_new ("request-surrounding", g_signal_new ("request-surrounding",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
@ -292,7 +292,7 @@ clutter_input_method_commit (ClutterInputMethod *im,
void void
clutter_input_method_delete_surrounding (ClutterInputMethod *im, clutter_input_method_delete_surrounding (ClutterInputMethod *im,
guint offset, int offset,
guint len) guint len)
{ {
ClutterInputMethodPrivate *priv; ClutterInputMethodPrivate *priv;

2
clutter/clutter/clutter-input-method.h
View File

@ -68,7 +68,7 @@ void clutter_input_method_commit (ClutterInputMethod *im,
const gchar *text); const gchar *text);
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_input_method_delete_surrounding (ClutterInputMethod *im, void clutter_input_method_delete_surrounding (ClutterInputMethod *im,
guint offset, int offset,
guint len); guint len);
CLUTTER_EXPORT CLUTTER_EXPORT
void clutter_input_method_request_surrounding (ClutterInputMethod *im); void clutter_input_method_request_surrounding (ClutterInputMethod *im);

14
clutter/clutter/clutter-text.c
View File

@ -348,13 +348,23 @@ clutter_text_input_focus_request_surrounding (ClutterInputFocus *focus)
static void static void
clutter_text_input_focus_delete_surrounding (ClutterInputFocus *focus, clutter_text_input_focus_delete_surrounding (ClutterInputFocus *focus,
guint offset, int offset,
guint len) guint len)
{ {
ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text; ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
int cursor;
int start;
cursor = clutter_text_get_cursor_position (clutter_text);
start = cursor + offset;
if (start < 0)
{
g_warning ("The offset '%d' of deleting surrounding is larger than the cursor pos '%d'",
offset, cursor);
return;
}
if (clutter_text_get_editable (clutter_text)) if (clutter_text_get_editable (clutter_text))
clutter_text_delete_text (clutter_text, offset, len); clutter_text_delete_text (clutter_text, start, len);
} }
static void static void

10
src/wayland/meta-wayland-text-input-legacy.c
View File

@ -94,17 +94,23 @@ meta_wayland_text_input_focus_request_surrounding (ClutterInputFocus *focus)
static void static void
meta_wayland_text_input_focus_delete_surrounding (ClutterInputFocus *focus, meta_wayland_text_input_focus_delete_surrounding (ClutterInputFocus *focus,
guint cursor, int offset,
guint len) guint len)
{ {
MetaWaylandGtkTextInput *text_input; MetaWaylandGtkTextInput *text_input;
uint32_t before_length;
uint32_t after_length;
struct wl_resource *resource; struct wl_resource *resource;
text_input = META_WAYLAND_GTK_TEXT_INPUT_FOCUS (focus)->text_input; text_input = META_WAYLAND_GTK_TEXT_INPUT_FOCUS (focus)->text_input;
before_length = offset <= 0 ? -offset : offset;
after_length = len >= before_length ? (len - before_length) : len + before_length;
wl_resource_for_each (resource, &text_input->focus_resource_list) wl_resource_for_each (resource, &text_input->focus_resource_list)
{ {
gtk_text_input_send_delete_surrounding_text (resource, cursor, len); gtk_text_input_send_delete_surrounding_text (resource,
before_length,
after_length);
} }
} }

10
src/wayland/meta-wayland-text-input.c
View File

@ -166,17 +166,23 @@ meta_wayland_text_input_focus_defer_done (ClutterInputFocus *focus)
static void static void
meta_wayland_text_input_focus_delete_surrounding (ClutterInputFocus *focus, meta_wayland_text_input_focus_delete_surrounding (ClutterInputFocus *focus,
guint cursor, int offset,
guint len) guint len)
{ {
MetaWaylandTextInput *text_input; MetaWaylandTextInput *text_input;
uint32_t before_length;
uint32_t after_length;
struct wl_resource *resource; struct wl_resource *resource;
text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input; text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input;
before_length = offset <= 0 ? -offset : offset;
after_length = len >= before_length ? (len - before_length) : len + before_length;
wl_resource_for_each (resource, &text_input->focus_resource_list) wl_resource_for_each (resource, &text_input->focus_resource_list)
{ {
zwp_text_input_v3_send_delete_surrounding_text (resource, cursor, len); zwp_text_input_v3_send_delete_surrounding_text (resource,
before_length,
after_length);
} }
meta_wayland_text_input_focus_defer_done (focus); meta_wayland_text_input_focus_defer_done (focus);