From d0b8fabcae7de284046f9263327c9fd3c3268b15 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Sat, 18 Jun 2016 13:39:31 +0900 Subject: [PATCH] Revert "[3.0] build error fix : chaged wayland api of wl_text_input_set_surrounding_text()" This reverts commit 30b93313b5665979118e2fd5bc52778f7e395af4. Change-Id: I2bcd4410893978636b1a4b1975bbea238345d04d --- adaptors/wayland/input/text/text-input-manager.cpp | 4 ++-- adaptors/wayland/input/text/text-input-manager.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) mode change 100755 => 100644 adaptors/wayland/input/text/text-input-manager.cpp mode change 100755 => 100644 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 100755 new mode 100644 index e9a5fc7..4e12d5d --- 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( uint32_t serial, std::string text, unsigned int cursor) +void TextInputManager::SetSurroundingText( std::string text, unsigned int cursor, unsigned int anchor ) { TextInputManager::SeatInfo& info = TextInputManager::Get().GetLastActiveSeat(); - wl_text_input_set_surrounding_text( info.mSeat->GetTextInputInterface(), serial, text.c_str(), cursor); + wl_text_input_set_surrounding_text( info.mSeat->GetTextInputInterface(), text.c_str(), cursor, anchor ); 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 100755 new mode 100644 index baa7da4..7033471 --- a/adaptors/wayland/input/text/text-input-manager.h +++ b/adaptors/wayland/input/text/text-input-manager.h @@ -220,11 +220,13 @@ 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 - * @param[in] serial the serial + * text anchor is the same as cursor. * @param[in] text the text * @param[in] cursor cursor position + * @param[in] anchor anchor position */ - void SetSurroundingText( uint32_t serial, std::string text, unsigned int cursor); + void SetSurroundingText( std::string text, unsigned int cursor, unsigned int anchor ); + public: // virtual keyboard signals -- 2.7.4