diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-12-12 19:12:34 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-12-12 19:12:34 +0000 |
| commit | 77f465bf191b1d64c1b33b9ac7edf68a92f45bcb (patch) | |
| tree | 59818e715166a7a2e6fcd019664be47d73234252 | |
| parent | 3fe6c5caf85b3c3032e7b505bff07b8c984e64a0 (diff) | |
| parent | c7c8ab662437a56dc038bef9c45eb6213bbcc6d5 (diff) | |
| download | gtk+-77f465bf191b1d64c1b33b9ac7edf68a92f45bcb.tar.gz | |
Merge branch 'terminal-3-24' into 'gtk-3-24'
imwayland: Suppport terminal purpose
See merge request GNOME/gtk!1245
| -rw-r--r-- | gtk/gtkenums.h | 4 | ||||
| -rw-r--r-- | modules/input/imwayland.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index 64104bc949..5bf3228a3e 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -985,6 +985,7 @@ G_END_DECLS * @GTK_INPUT_PURPOSE_NAME: Edited field expects the name of a person * @GTK_INPUT_PURPOSE_PASSWORD: Like @GTK_INPUT_PURPOSE_FREE_FORM, but characters are hidden * @GTK_INPUT_PURPOSE_PIN: Like @GTK_INPUT_PURPOSE_DIGITS, but characters are hidden + * @GTK_INPUT_PURPOSE_TERMINAL: Allow any character, in addition to control codes * * Describes primary purpose of the input widget. This information is * useful for on-screen keyboards and similar input methods to decide @@ -1018,7 +1019,8 @@ typedef enum GTK_INPUT_PURPOSE_EMAIL, GTK_INPUT_PURPOSE_NAME, GTK_INPUT_PURPOSE_PASSWORD, - GTK_INPUT_PURPOSE_PIN + GTK_INPUT_PURPOSE_PIN, + GTK_INPUT_PURPOSE_TERMINAL, } GtkInputPurpose; /** diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c index 021f556877..1c742713b4 100644 --- a/modules/input/imwayland.c +++ b/modules/input/imwayland.c @@ -419,6 +419,8 @@ translate_purpose (GtkInputPurpose purpose) return ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PASSWORD; case GTK_INPUT_PURPOSE_PIN: return ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_PIN; + case GTK_INPUT_PURPOSE_TERMINAL: + return ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL; } return ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NORMAL; |