Merge branch 'terminal' into 'master'

imwayland: Suppport terminal purpose

See merge request GNOME/gtk!1243
This commit is contained in:
Matthias Clasen 2019-12-12 17:57:05 +00:00
commit d564cb2a7e
2 changed files with 5 additions and 1 deletions

View File

@ -862,6 +862,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
@ -893,7 +894,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;
/**

View File

@ -424,6 +424,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;
default:
g_assert_not_reached ();
}