From 3bcba347a244e1ee32a2e4f7f543a16f7a17d7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 17 Nov 2015 16:00:29 +0800 Subject: Use text input protocol from wayland-protocols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas Ådahl Reviewed-by: Mariusz Ceier Reviewed-by: Jan Arne Petersen Reviewed-by: Pekka Paalanen --- clients/keyboard.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'clients/keyboard.c') 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 && -- cgit v1.2.1