diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:29 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 13:07:10 +0200 |
| commit | 3bcba347a244e1ee32a2e4f7f543a16f7a17d7e5 (patch) | |
| tree | 8755c99f1d52a7853d2e4b495d8219b3c5c1d387 /clients/keyboard.c | |
| parent | 57e48f023c1b1fbef174b6c0c17394debc066ab1 (diff) | |
| download | weston-3bcba347a244e1ee32a2e4f7f543a16f7a17d7e5.tar.gz | |
Use text input protocol from wayland-protocols
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'clients/keyboard.c')
| -rw-r--r-- | clients/keyboard.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clients/keyboard.c b/clients/keyboard.c index f5ffe301..e1f8ad35 100644 --- a/clients/keyboard.c +++ b/clients/keyboard.c @@ -33,7 +33,7 @@ #include "window.h" #include "input-method-client-protocol.h" -#include "text-client-protocol.h" +#include "text-input-unstable-v1-client-protocol.h" struct keyboard; @@ -216,7 +216,7 @@ static const struct layout normal_layout = { 12, 4, "en", - WL_TEXT_INPUT_TEXT_DIRECTION_LTR + ZWP_TEXT_INPUT_V1_TEXT_DIRECTION_LTR }; static const struct layout numeric_layout = { @@ -225,7 +225,7 @@ static const struct layout numeric_layout = { 12, 2, "en", - WL_TEXT_INPUT_TEXT_DIRECTION_LTR + ZWP_TEXT_INPUT_V1_TEXT_DIRECTION_LTR }; static const struct layout arabic_layout = { @@ -234,7 +234,7 @@ static const struct layout arabic_layout = { 13, 4, "ar", - WL_TEXT_INPUT_TEXT_DIRECTION_RTL + ZWP_TEXT_INPUT_V1_TEXT_DIRECTION_RTL }; static const char *style_labels[] = { @@ -339,8 +339,8 @@ static const struct layout * get_current_layout(struct virtual_keyboard *keyboard) { switch (keyboard->content_purpose) { - case WL_TEXT_INPUT_CONTENT_PURPOSE_DIGITS: - case WL_TEXT_INPUT_CONTENT_PURPOSE_NUMBER: + case ZWP_TEXT_INPUT_V1_CONTENT_PURPOSE_DIGITS: + case ZWP_TEXT_INPUT_V1_CONTENT_PURPOSE_NUMBER: return &numeric_layout; default: if (keyboard->preferred_language && |