From 30b93313b5665979118e2fd5bc52778f7e395af4 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 14 Jun 2016 15:10:28 +0900 Subject: [PATCH] [3.0] build error fix : chaged wayland api of wl_text_input_set_surrounding_text() Change-Id: I0bbccd7afcafcf065161956d79ce391b80b87a41 --- adaptors/wayland/input/text/text-input-manager.cpp | 4 ++-- adaptors/wayland/input/text/text-input-manager.h | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) mode change 100644 => 100755 adaptors/wayland/input/text/text-input-manager.cpp mode change 100644 => 100755 adaptors/wayland/input/text/text-input-manager.h diff --git a/adaptors/wayland/input/text/text-input-manager.cpp b/adaptors/wayland/input/text/text-input-manager.cpp old mode 100644 new mode 100755 index 4e12d5d..e9a5fc7 --- a/adaptors/wayland/input/text/text-input-manager.cpp +++ b/adaptors/wayland/input/text/text-input-manager.cpp @@ -373,11 +373,11 @@ void TextInputManager::Reset() wl_display_flush( mDisplay ); } -void TextInputManager::SetSurroundingText( std::string text, unsigned int cursor, unsigned int anchor ) +void TextInputManager::SetSurroundingText( uint32_t serial, std::string text, unsigned int cursor) { TextInputManager::SeatInfo& info = TextInputManager::Get().GetLastActiveSeat(); - wl_text_input_set_surrounding_text( info.mSeat->GetTextInputInterface(), text.c_str(), cursor, anchor ); + wl_text_input_set_surrounding_text( info.mSeat->GetTextInputInterface(), serial, text.c_str(), cursor); wl_display_flush( mDisplay ); } diff --git a/adaptors/wayland/input/text/text-input-manager.h b/adaptors/wayland/input/text/text-input-manager.h old mode 100644 new mode 100755 index 7033471..baa7da4 --- a/adaptors/wayland/input/text/text-input-manager.h +++ b/adaptors/wayland/input/text/text-input-manager.h @@ -220,13 +220,11 @@ public: * UTF-8 encoded. Cursor is the byte offset within the * surrounding text. Anchor is the byte offset of the * selection anchor within the surrounding text. If there is no selected - * text anchor is the same as cursor. + * @param[in] serial the serial * @param[in] text the text * @param[in] cursor cursor position - * @param[in] anchor anchor position */ - void SetSurroundingText( std::string text, unsigned int cursor, unsigned int anchor ); - + void SetSurroundingText( uint32_t serial, std::string text, unsigned int cursor); public: // virtual keyboard signals -- 2.7.4