提交: fcbd616b097d039c69b5a294fb364c980cbdf556 - main (git)

Commit MetaInfo

• 修訂: fcbd616b097d039c69b5a294fb364c980cbdf556 (tree)
• 時間: 2012-09-04 02:44:21
• 作者: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

InputBoxのソースを整理、挙動のバグを修正
例外発生時の処理をいくつか追加

Change Summary

• modified: client/CardManager.cpp
• modified: client/Client.cpp
• modified: client/scene/MainLoop.cpp
• modified: client/ui/Input.cpp
• modified: client/ui/Input.hpp
• modified: client/ui/InputBox.cpp
• modified: client/ui/InputBox.hpp
• modified: common/network/Command.hpp
• modified: common/network/Encrypter.cpp
• modified: common/network/Encrypter.hpp
• modified: server/main.cpp

差異

Binary files a/client/CardManager.cpp and b/client/CardManager.cpp differ

--- a/client/Client.cpp
+++ b/client/Client.cpp
@@ -58,9 +58,12 @@ Client::Client(const std::string& host,
     std::stringstream port_str;
     port_str << remote_tcp_port;
 
-    {
+    try {
         tcp::resolver::query query(host, port_str.str());
         iterator_ = resolver_.resolve(query);
+    } catch (const std::exception& e) {
+        Logger::Error(_T("%s"), unicode::ToTString(e.what()));
+        return;
     }
 
     udp::resolver resolver(io_service_);

--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -66,11 +66,11 @@ void MainLoop::Update()
     player_manager_->ProcessInput(&input);
     player_manager_->Update();
 
-    card_manager_->ProcessInput(&input);
-    card_manager_->Update();
-
     world_manager_->ProcessInput(&input);
     world_manager_->Update();
+    
+    card_manager_->ProcessInput(&input);
+    card_manager_->Update();
 }
 
 void MainLoop::Draw()

--- a/client/ui/Input.cpp
+++ b/client/ui/Input.cpp
@@ -6,15 +6,8 @@
 #include <DxLib.h>
 #include <stdint.h>
 
+const size_t Input::TEXT_BUFFER_SIZE = 1024;
 const size_t Input::HISTORY_MAX_SIZE = 50;
-
-const int Input::DEFAULT_MAX_WIDTH = 600;
-
-const int Input::BOX_MIN_WIDTH = 200;
-const int Input::BOX_TOP_MARGIN = 36;
-const int Input::BOX_BOTTOM_MARGIN = 24;
-const int Input::BOX_SIDE_MARGIN = 24;
-
 const int Input::KEY_REPEAT_FRAME = 6;
 
 const int Input::INPUT_MARGIN_X = 8;
@@ -26,7 +19,8 @@ const int Input::IME_MARGIN_Y = 16;
 const int Input::IME_MAX_PAGE_SIZE = 6;
 const int Input::IME_MIN_WIDTH = 120;
 
-Input::Input()
+Input::Input() :
+    reverse_color_(false)
 {
     input_bg_image_handle_ = ResourceManager::LoadCachedDivGraph<4>(
             _T("resources/images/gui/gui_inputbox_input_bg.png"), 2, 2, 12, 12);
@@ -54,7 +48,13 @@ Input::Input()
 void Input::Draw()
 {
     {
-        SetDrawBlendMode(DX_BLENDMODE_ALPHA, 200);
+        int alpha = active() ? 255 : 150;
+
+        if (reverse_color_) {
+            SetDrawBlendMode(DX_BLENDMODE_INVSRC, alpha);
+        } else {
+            SetDrawBlendMode(DX_BLENDMODE_ALPHA, alpha);
+        }
 
         DrawGraph(x_, y_, *input_bg_image_handle_[0], TRUE);
         DrawGraph(x_ + width_ - 12, y_, *input_bg_image_handle_[1], TRUE);
@@ -142,7 +142,7 @@ void Input::Draw()
             current_line++;
         }
 
-        int text_color = GetColor(0, 0, 0);
+        int text_color = reverse_color_ ? GetColor(255, 255, 255) : GetColor(0, 0, 0);
         current_line = 0;
 
         if (message_lines_.size() > 0) {
@@ -292,20 +292,16 @@ void Input::ProcessInput(InputManager* input)
             + KEY_REPEAT_FRAME) % (KEY_REPEAT_FRAME + 1) == 0;
     // bool push_long_backspace = (input->GetKeyCount(KEY_INPUT_BACK) > 60 * 1.5);
 
-    auto input_text = GetInputString();
-    if (!active() && first_key_return && CheckKeyInput(input_handle_) == 0) {
-        set_active(true);
-    } else if (!active() && push_key_v && push_key_ctrl) {
+    auto input_text = text();
+    if (!active() && push_key_v && push_key_ctrl) {
         set_active(true);
     } else {
         if (push_key_shift && first_key_return) {
             SetActiveKeyInput(input_handle_);
         } else if (first_key_return) {
-            if (input_text.size() == 0) {
-                set_active(false);
-            } else if (CheckKeyInput(input_handle_) == 1) {
+            if (CheckKeyInput(input_handle_) == 1) {
                 if (on_enter_) {
-                    if (on_enter_(input_text)) {
+                    if (on_enter_(unicode::ToString(input_text))) {
                         SetKeyInputString(_T(""), input_handle_);
                     }
                 }
@@ -314,57 +310,6 @@ void Input::ProcessInput(InputManager* input)
         }
     }
 
-//    if (active() && push_long_backspace && GetKeyInputCursorPosition(input_handle_) == 0) {
-//        if (selecting_tab_index_ == -1) {
-//            script_tab_.message.clear();
-//        } else {
-//            tabs_.at(selecting_tab_index_).message.clear();
-//        }
-//    }
-//
-//    ProcessInputTabs(input);
-//    UpdateBase(input);
-//    UpdateTabs();
-//
-//    if (push_mouse_left) {
-//        if (cursor_drag_count == 1) {
-//            prev_cursor_pos_ = GetKeyInputCursorPosition(input_handle_);
-//        }
-//        cursor_drag_count++;
-//        input->CancelMouseLeft();
-//    } else {
-//        cursor_drag_count = 0;
-//    }
-//
-//    if (first_key_shift) {
-//        prev_cursor_pos_ = GetKeyInputCursorPosition(input_handle_);
-//    }
-//
-//    x_ = x_ + BOX_SIDE_MARGIN;
-//    y_ = y_ + BOX_TOP_MARGIN;
-//    width_ = width_ - BOX_SIDE_MARGIN * 2;
-//
-//    if (push_mouse_left) {
-//        auto pos = input->GetMousePos();
-//        int internal_x = x_ + INPUT_MARGIN_X;
-//        int internal_y = y_ + INPUT_MARGIN_Y;
-//        cursor_moveto_x_ = pos.first - internal_x;
-//        cursor_moveto_y_ = pos.second - internal_y;
-//        ResetCursorCount();
-//    }
-//
-//    if (cursor_drag_count > 1) {
-//        SetKeyInputSelectArea(GetKeyInputCursorPosition(input_handle_),
-//                prev_cursor_pos_, input_handle_);
-//    }
-//
-//    // カーソル移動中は強制表示
-//    if (input->GetKeyCount(KEY_INPUT_RIGHT) > 0
-//            || input->GetKeyCount(KEY_INPUT_LEFT) > 0) {
-//
-//        ResetCursorCount();
-//    }
-
     if (push_repeat_key_up) {
         cursor_moveto_y_ = cursor_y_ - font_height_ / 2;
         cursor_moveto_x_ = cursor_x_ + 2;
@@ -375,12 +320,12 @@ void Input::ProcessInput(InputManager* input)
 
     if (push_key_shift && push_repeat_key_return && multiline_) {
 
-        auto buffer = GetInputString();
+        auto buffer = text();
         uint32_t pos = GetKeyInputCursorPosition(input_handle_);
 
-        std::string cursor_front_str = buffer.substr(0, pos);       // カーソル前の文字列
-        std::string cursor_back_str = buffer.substr(pos);           // カーソル後の文字列
-        auto new_string = cursor_front_str + '\n' + cursor_back_str;
+        tstring cursor_front_str = buffer.substr(0, pos);       // カーソル前の文字列
+        tstring cursor_back_str = buffer.substr(pos);           // カーソル後の文字列
+        auto new_string = cursor_front_str + _T('\n') + cursor_back_str;
 
         SetKeyInputString(unicode::ToTString(new_string).c_str(), input_handle_);
         SetKeyInputCursorPosition(pos + 1, input_handle_);
@@ -391,14 +336,14 @@ void Input::ProcessInput(InputManager* input)
     int cursor_byte_pos, cursor_dot_pos;
     int draw_dot_pos = 0;
 
-    TCHAR String[1024];
+    TCHAR String[TEXT_BUFFER_SIZE];
     GetKeyInputString(String, input_handle_);
 
     // 単一行設定の時、最初の行だけを表示
     if (!multiline_) {
         tstring buffer(String, _tcslen(String));
         size_t pos;
-        if ((pos = buffer.find('\n')) != std::string::npos) {
+        if ((pos = buffer.find(_T('\n'))) != std::string::npos) {
             SetKeyInputString(buffer.substr(0, pos).c_str(), input_handle_);
         }
     }
@@ -443,7 +388,7 @@ void Input::ProcessInput(InputManager* input)
         #endif
 
             line_width += width;
-            if (c == '\n'
+            if (c == _T('\n')
                     || line_width > internal_width - font_height_ / 2) {
                 message_lines_.push_back(line_buffer);
                 current_line++;
@@ -567,14 +512,14 @@ void Input::ProcessInput(InputManager* input)
             }
 
             line_width += width;
-            if (c == '\n' || line_width > internal_width - font_height_ / 2) {
+            if (c == _T('\n') || line_width > internal_width - font_height_ / 2) {
                 lines_.push_back(line_buffer);
 
                 if (cursor_moveto_x_ >= line_width
                         && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
                         && cursor_moveto_y_
                                 <= (static_cast<int>(lines_.size() + message_lines_.size()) + 1) * font_height_) {
-                    if (c == '\n') {
+                    if (c == _T('\n')) {
                         SetKeyInputCursorPosition(char_count - 1,
                                 input_handle_);
                     } else {
@@ -703,14 +648,14 @@ void Input::ProcessInput(InputManager* input)
             }
 
             line_width += width;
-            if (c == '\n' || line_width > internal_width - font_height_ / 2) {
+            if (c == _T('\n') || line_width > internal_width - font_height_ / 2) {
                 lines_.push_back(line_buffer);
 
                 if (cursor_moveto_x_ >= line_width
                         && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
                         && cursor_moveto_y_
                                 <= (static_cast<int>(lines_.size() + message_lines_.size()) + 1) * font_height_) {
-                    if (c == '\n') {
+                    if (c == _T('\n')) {
                         SetKeyInputCursorPosition(char_count - 1,
                                 input_handle_);
                     } else {
@@ -753,13 +698,6 @@ void Input::ProcessInput(InputManager* input)
     }
 }
 
-std::string Input::GetInputString()
-{
-    TCHAR String[1024];
-    GetKeyInputString(String, input_handle_);
-    return unicode::ToString(tstring(String, _tcslen(String)));
-}
-
 bool Input::active()
 {
     return GetActiveKeyInput() == input_handle_;
@@ -830,7 +768,7 @@ void Input::set_height(int height)
 
 tstring Input::text() const
 {
-    TCHAR String[1024];
+    TCHAR String[TEXT_BUFFER_SIZE];
     GetKeyInputString(String, input_handle_);
     return tstring(String, _tcslen(String));
 }
@@ -854,3 +792,13 @@ void Input::set_on_enter(const CallbackFunc& func)
 {
     on_enter_ = func;
 }
+
+bool Input::reverse_color() const
+{
+    return reverse_color_;
+}
+
+void Input::set_reverse_color(bool flag)
+{
+    reverse_color_ = flag;
+}
\ No newline at end of file

--- a/client/ui/Input.hpp
+++ b/client/ui/Input.hpp
@@ -19,8 +19,6 @@ class Input {
         void Update();
         void ProcessInput(InputManager* input);
 
-        std::string GetInputString();
-
         bool active();
         void set_active(bool flag);
 
@@ -39,11 +37,16 @@ class Input {
         tstring message() const;
         void set_message(const tstring& message);
 
+        bool reverse_color() const;
+        void set_reverse_color(bool flag);
+
         void set_on_enter(const CallbackFunc& func);
 
+    public:    
+        void CancelSelect();
+
     private:
         void ResetCursorCount();
-        void CancelSelect();
 
     private:
         int x_, y_, width_, height_;
@@ -71,18 +74,12 @@ class Input {
         CallbackFunc on_enter_;
         tstring message_;
 
+        bool reverse_color_;
         int blink_count_;
 
     private:
+        const static size_t TEXT_BUFFER_SIZE;
         const static size_t HISTORY_MAX_SIZE;
-
-        const static int DEFAULT_MAX_WIDTH;
-
-        const static int BOX_MIN_WIDTH;
-        const static int BOX_TOP_MARGIN;
-        const static int BOX_BOTTOM_MARGIN;
-        const static int BOX_SIDE_MARGIN;
-
         const static int KEY_REPEAT_FRAME;
 
         const static int INPUT_MARGIN_X;

--- a/client/ui/InputBox.cpp
+++ b/client/ui/InputBox.cpp
@@ -38,20 +38,13 @@ InputBox::InputBox(const ManagerAccessorPtr& manager_accessor) :
                 width_(800),
                 height_(100),
                 multiline_(true),
-                input_handle_(MakeKeyInput(400, FALSE, FALSE, FALSE)),
                 font_height_(ResourceManager::default_font_size()),
                 drag_offset_x_(-1),
                 drag_offset_y_(-1),
                 drag_resize_offset_x_(-1),
                 drag_resize_offset_y_(-1),
                 min_input_height_(font_height_ + INPUT_MARGIN_Y * 2),
-                cursor_moveto_x_(-1),
-                cursor_moveto_y_(-1),
-                selecting_candidate_(-1),
-                candidate_x_(-1),
-                candidate_y_(-1),
                 selecting_tab_index_(0),
-                blink_count_(0),
                 manager_accessor_(manager_accessor),
                 card_(std::make_shared<Card>(manager_accessor_, "", "immo", "", "", "",
                             std::vector<std::string>(), false, false))
@@ -60,8 +53,6 @@ InputBox::InputBox(const ManagerAccessorPtr& manager_accessor) :
     font_handle_ = ResourceManager::default_font_handle();
     bg_image_handle_ = ResourceManager::LoadCachedDivGraph<4>(
             _T("resources/images/gui/gui_inputbox_bg.png"), 2, 2, 24, 24);
-    input_bg_image_handle_ = ResourceManager::LoadCachedDivGraph<4>(
-            _T("resources/images/gui/gui_inputbox_input_bg.png"), 2, 2, 12, 12);
     tab_bg_image_handle_ = ResourceManager::LoadCachedDivGraph<4>(
             _T("resources/images/gui/gui_inputbox_tab_bg.png"), 2, 2, 12, 12);
     tab_bg_inactive_image_handle_ = ResourceManager::LoadCachedDivGraph<4>(
@@ -71,26 +62,52 @@ InputBox::InputBox(const ManagerAccessorPtr& manager_accessor) :
 
     script_icon_image_handle_ = ResourceManager::LoadCachedGraph(_T("resources/images/gui/gui_inputbox_tab_script_icon.png"));
 
-    input_height_ = font_height_ + INPUT_MARGIN_Y * 2;
-
     int screen_width, screen_height;
     GetScreenState(&screen_width, &screen_height, nullptr);
     width_ = std::min(DEFAULT_MAX_WIDTH + 0, (int)(screen_width * 0.4));
-    height_ = input_height_ + BOX_TOP_MARGIN + BOX_BOTTOM_MARGIN;
+    height_ = input_.height() + BOX_TOP_MARGIN + BOX_BOTTOM_MARGIN;
     x_ = (screen_width - width_) / 2;
     y_ = screen_height - height_ - BOX_BOTTOM_MARGIN;
 
     selecting_tab_index_ = 0;
 
-
+    Activate();
     if (auto card_manager = manager_accessor_->card_manager().lock()) {
         card_manager->AddCard(card_);
     }
+
+    input_.set_on_enter([this](const std::string& text) -> bool{
+
+        if (input_.text().empty()) {
+            input_.set_active(false);
+        } else {
+            if (selecting_tab_index_ == -1) {
+                card_->Execute(unicode::ToString(input_.text()), "mmo",
+                        [&](const v8::Handle<v8::Value>& result, const std::string& error){
+                    if (error.size() > 0) {
+                        script_tab_.message = unicode::ToTString(error);
+                    } else if (!result.IsEmpty()) {
+                        script_tab_.message = _T("=> ") +
+                            unicode::ToTString(std::string(*String::Utf8Value(result->ToString())));
+                    } else {
+                        script_tab_.message = _T("");
+                    }
+                    input_.set_message(script_tab_.message);
+                });
+            } else if (!tabs_.empty()) {
+                if (auto card =
+                        tabs_.at(selecting_tab_index_).card.lock()) {
+                    card->onEnter(unicode::ToString(input_.text()));
+                }
+            }
+        }
+
+        return true;
+    });
 }
 
 InputBox::~InputBox()
 {
-    DeleteKeyInput(input_handle_);
 }
 
 void InputBox::DrawTabs()
@@ -99,8 +116,7 @@ void InputBox::DrawTabs()
     {
         int tab_index = 0;
         SetDrawArea(x_, script_tab_.y, script_tab_.x, script_tab_.y + script_tab_.height);
-        for (auto it = tabs_.begin(); it != tabs_.end(); ++it) {
-            auto tab = *it;
+        BOOST_FOREACH(auto& tab, tabs_) {
 
             std::array<ImageHandlePtr, 4>* image_handle;
             if (selecting_tab_index_ == tab_index) {
@@ -232,232 +248,11 @@ void InputBox::DrawBase()
     SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
 }
 
-void InputBox::DrawInputBase()
-{
-    int input_bg_alpha;
-    if (IsActive()) {
-        input_bg_alpha = 255;
-    } else {
-        input_bg_alpha = 100;
-    }
-
-    if (IsScriptMode()) {
-        SetDrawBlendMode(DX_BLENDMODE_INVSRC, input_bg_alpha);
-    } else {
-        SetDrawBlendMode(DX_BLENDMODE_ALPHA, input_bg_alpha);
-    }
-
-    DrawGraph(input_x_, input_y_, *input_bg_image_handle_[0], TRUE);
-    DrawGraph(input_x_ + input_width_ - 12, input_y_, *input_bg_image_handle_[1], TRUE);
-    DrawGraph(input_x_, input_y_ + input_height_ - 12, *input_bg_image_handle_[2], TRUE);
-    DrawGraph(input_x_ + input_width_ - 12, input_y_ + input_height_ - 12, *input_bg_image_handle_[3], TRUE);
-
-    DrawRectExtendGraphF(input_x_ + 12, input_y_,
-                         input_x_ + input_width_ - 12, input_y_ + 12,
-                         0, 0, 1, 12, *input_bg_image_handle_[1], TRUE);
-
-    DrawRectExtendGraphF(input_x_ + 12, input_y_ + input_height_ - 12,
-                         input_x_ + input_width_ - 12, input_y_ + input_height_,
-                         0, 0, 1, 12, *input_bg_image_handle_[3], TRUE);
-
-    DrawRectExtendGraphF(input_x_, input_y_ + 12,
-                         input_x_ + 12, input_y_ + input_height_ - 12,
-                         0, 0, 12, 1, *input_bg_image_handle_[2], TRUE);
-
-    DrawRectExtendGraphF(input_x_ + input_width_ - 12, input_y_ + 12,
-                         input_x_ + input_width_, input_y_ + input_height_ - 12,
-                         0, 0, 12, 1, *input_bg_image_handle_[3], TRUE);
-
-    DrawRectExtendGraphF(input_x_ +  12, input_y_ + 12,
-                         input_x_ + input_width_ - 12, input_y_ + input_height_ - 12,
-                         0, 0, 1, 1, *input_bg_image_handle_[3], TRUE);
-
-    SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-}
-
-void InputBox::DrawInputText()
-{
-    int internal_x = input_x_ + INPUT_MARGIN_X;
-    int internal_y = input_y_ + INPUT_MARGIN_Y;
-    // int internal_width = input_width_ - INPUT_MARGIN * 2;
-    // int internal_height = input_height_ - INPUT_MARGIN * 2;
-
-    // 選択範囲の背景を描画
-    int current_line = 0;
-    for (auto it = selecting_lines_.begin(); it != selecting_lines_.end(); ++it) {
-        auto line = *it;
-        if (line.first < line.second) {
-            SetDrawBlendMode(DX_BLENDMODE_ALPHA, 100);
-            DrawBox(internal_x + line.first,
-                    internal_y + current_line * font_height_,
-                    internal_x + line.second,
-                    internal_y + (current_line + 1) * font_height_,
-                    GetColor(255, 0, 255), TRUE);
-            SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-        }
-        current_line++;
-    }
-
-    current_line = 0;
-    for (auto it = clause_lines_.begin(); it != clause_lines_.end(); ++it) {
-        auto line = *it;
-        if (line.first < line.second) {
-            SetDrawBlendMode(DX_BLENDMODE_ALPHA, 100);
-            DrawBox(internal_x + line.first,
-                    internal_y + current_line * font_height_,
-                    internal_x + line.second,
-                    internal_y + (current_line + 1) * font_height_,
-                    GetColor(0, 255, 255), TRUE);
-            SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-        }
-        current_line++;
-    }
-
-    current_line = 0;
-    candidate_x_ = -1, candidate_y_ = -1;
-    for (auto it = selecting_clause_lines_.begin(); it != selecting_clause_lines_.end(); ++it) {
-        auto line = *it;
-        if (line.first < line.second) {
-            SetDrawBlendMode(DX_BLENDMODE_ALPHA, 100);
-            DrawBox(internal_x + line.first,
-                    internal_y + current_line * font_height_,
-                    internal_x + line.second,
-                    internal_y + (current_line + 1) * font_height_,
-                    GetColor(255, 0, 255), TRUE);
-            SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-
-            if (candidate_x_ < 0) {
-                candidate_x_ = line.first;
-                candidate_y_ = (current_line + 1) * font_height_;
-            }
-        }
-        current_line++;
-    }
-
-    int text_color = IsScriptMode() ? GetColor(255, 255, 255) : GetColor(0, 0, 0);
-    current_line = 0;
-
-    if (message_lines_.size() > 0) {
-    for (auto it = message_lines_.begin(); it != message_lines_.end(); ++it) {
-        auto line = *it;
-            SetDrawBlendMode(DX_BLENDMODE_ALPHA, 140);
-            DrawStringToHandle(internal_x,
-                    internal_y + current_line * font_height_ - 3, unicode::ToTString(line).c_str(),
-                    text_color, font_handle_);
-            SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-            current_line++;
-        }
-    }
-
-    for (auto it = lines_.begin(); it != lines_.end(); ++it) {
-        auto line = *it;
-        DrawStringToHandle(internal_x, internal_y + current_line * font_height_,
-            unicode::ToTString(line).c_str(), text_color, font_handle_);
-        current_line++;
-    }
-
-    // カーソルを描画
-    if (clause_lines_.size() <= 0 && IsActive() && blink_count_ < 30) {
-        DrawBox(internal_x + cursor_x_, internal_y + cursor_y_,
-                internal_x + cursor_x_ + 2,
-                internal_y + cursor_y_ + font_height_, text_color,
-                TRUE);
-    }
-}
-
-void InputBox::DrawCandidates()
-{
-    int internal_x = input_x_ + INPUT_MARGIN_X;
-    int internal_y = input_y_ + INPUT_MARGIN_Y;
-
-    if (selecting_candidate_ >= 0) {
-
-        int start_index = (selecting_candidate_ / IME_MAX_PAGE_SIZE)
-                * IME_MAX_PAGE_SIZE;
-        int end_index = std::min(start_index + IME_MAX_PAGE_SIZE,
-                static_cast<int>(candidates_.size() - 1));
-
-        int x = candidate_x_;
-        int y;
-        int width = IME_MIN_WIDTH;
-        int height = (end_index - start_index) * font_height_;
-
-        for (int i = start_index; i < end_index; i++) {
-            auto candidate = unicode::ToTString(candidates_[i]);
-            width = std::max(width,
-                    GetDrawStringWidthToHandle(candidate.c_str(),
-                            candidate.size(), font_handle_));
-        }
-
-        int screen_height;
-        GetScreenState(nullptr, &screen_height, nullptr);
-
-        if (internal_y + height + candidate_x_ >= screen_height - IME_MARGIN_Y * 2) {
-            y = candidate_y_ - font_height_ - height - IME_MARGIN_Y;
-        } else {
-            y = candidate_y_ + IME_MARGIN_Y;
-        }
-
-        if (height > 0) {
-            int base_x = internal_x + x - IME_MARGIN_BASE;
-            int base_y = internal_y + y - IME_MARGIN_BASE;
-            int base_width = width + IME_MARGIN_BASE * 2;
-            int base_height = height + IME_MARGIN_BASE * 2;
-
-            DrawGraph(base_x, base_y, *ime_image_handle_[0], TRUE);
-            DrawGraph(base_x + base_width - 12, base_y, *ime_image_handle_[1], TRUE);
-            DrawGraph(base_x, base_y + base_height - 12, *ime_image_handle_[2], TRUE);
-            DrawGraph(base_x + base_width - 12, base_y + base_height - 12,
-                    *ime_image_handle_[3], TRUE);
-
-            DrawRectExtendGraphF(base_x + 12, base_y, base_x + base_width - 12,
-                    base_y + 12, 0, 0, 1, 12, *ime_image_handle_[1], TRUE);
-
-            DrawRectExtendGraphF(base_x + 12, base_y + base_height - 12,
-                    base_x + base_width - 12, base_y + base_height, 0, 0, 1, 12,
-                    *ime_image_handle_[3], TRUE);
-
-            DrawRectExtendGraphF(base_x, base_y + 12, base_x + 12,
-                    base_y + base_height - 12, 0, 0, 12, 1, *ime_image_handle_[2],
-                    TRUE);
-
-            DrawRectExtendGraphF(base_x + base_width - 12, base_y + 12,
-                    base_x + base_width, base_y + base_height - 12, 0, 0, 12, 1,
-                    *ime_image_handle_[3], TRUE);
-
-            DrawRectExtendGraphF(base_x + 12, base_y + 12, base_x + base_width - 12,
-                    base_y + base_height - 12, 0, 0, 1, 1, *ime_image_handle_[3],
-                    TRUE);
-        }
-
-        int line_top = 0;
-        for (int i = start_index; i < end_index; i++) {
-            if (i == selecting_candidate_) {
-                SetDrawBlendMode(DX_BLENDMODE_ALPHA, 100);
-                DrawBox(internal_x + x - 2,
-                        internal_y + line_top + y,
-                        internal_x + x + width + 2,
-                        internal_y + line_top + y + font_height_,
-                        GetColor(255, 0, 255), TRUE);
-                SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
-            }
-            DrawStringToHandle(internal_x + x,
-                    internal_y + line_top + y,
-                    unicode::ToTString(candidates_[i]).c_str(), GetColor(0, 0, 0),
-                    font_handle_);
-            line_top += font_height_;
-        }
-    }
-}
-
 void InputBox::Draw()
 {
     DrawBase();
-    DrawInputBase();
-    DrawInputText();
     DrawTabs();
-    DrawCandidates();
-    // card_->Draw();
+    input_.Draw();
 }
 
 int InputBox::multiline() const
@@ -472,20 +267,7 @@ void InputBox::set_multiline(int multiline)
 
 void InputBox::CancelSelect()
 {
-    int pos = GetKeyInputCursorPosition(input_handle_);
-    prev_cursor_pos_ = pos;
-    SetKeyInputSelectArea(-1, -1, input_handle_);
-}
-
-void InputBox::UpdateCursorCount()
-{
-    blink_count_ += 1;
-    blink_count_ %= 60;
-}
-
-void InputBox::ResetCursorCount()
-{
-    blink_count_ = 0;
+    input_.CancelSelect();
 }
 
 bool InputBox::IsScriptMode()
@@ -510,29 +292,22 @@ void InputBox::SwitchTab(int index)
 
     if (selecting_tab_index_ == -1) {
         SetInputString(script_tab_.text);
+        input_.set_message(script_tab_.message);
+        input_.set_reverse_color(true);
     } else if (!tabs_.empty()) {
         SetInputString(tabs_.at(selecting_tab_index_).text);
+        input_.set_message(tabs_.at(selecting_tab_index_).message);
+        input_.set_reverse_color(false);
     }
 }
 
-std::string InputBox::GetInputString() const {
-    TCHAR String[1024];
-    GetKeyInputString(String, input_handle_);
-    return unicode::ToString(tstring(String, _tcslen(String)));
-}
-
-void InputBox::SetInputString(const std::string& text)
-{
-    SetKeyInputString(unicode::ToTString(text).c_str(), input_handle_);
+tstring InputBox::GetInputString() const {
+    return input_.text();
 }
 
-
-void InputBox::AddInputHistory(const std::string& text)
+void InputBox::SetInputString(const tstring& text)
 {
-    history_.push_back(text);
-    if (history_.size() > HISTORY_MAX_SIZE) {
-        history_.pop_front();
-    }
+    input_.set_text(text);
 }
 
 void InputBox::ProcessInput(InputManager* input)
@@ -563,496 +338,46 @@ void InputBox::ProcessInput(InputManager* input)
             + KEY_REPEAT_FRAME) % (KEY_REPEAT_FRAME + 1) == 0;
     bool push_long_backspace = (input->GetKeyCount(KEY_INPUT_BACK) > 60 * 1.5);
 
-    auto input_text = GetInputString();
-    if (!IsActive() && first_key_return && CheckKeyInput(input_handle_) == 0) {
+    bool empty = input_.text().empty();
+    input_.ProcessInput(input);
+
+    if (IsActive() && first_key_return && empty) {
+        Inactivate();
+    } else if (!IsActive() && first_key_return) {
         Activate();
     } else if (!IsActive() && push_key_v && push_key_ctrl) {
         Activate();
-    } else {
-        if (push_key_shift && first_key_return) {
-            SetActiveKeyInput(input_handle_);
-        } else if (first_key_return) {
-            if (input_text.size() == 0) {
-                Inactivate();
-            } else if (CheckKeyInput(input_handle_) == 1) {
-                AddInputHistory(input_text);
-                if (selecting_tab_index_ == -1) {
-                    SetKeyInputString(_T(""), input_handle_);
-                    card_->Execute(input_text, "immo",
-                            [&](const v8::Handle<v8::Value>& result, const std::string& error){
-                        if (error.size() > 0) {
-                            script_tab_.message = error;
-                        } else if (!result.IsEmpty()) {
-                            script_tab_.message = "=> " + std::string(*String::Utf8Value(result->ToString()));
-                        } else {
-                            script_tab_.message = "";
-                        }
-                    });
-                } else if (!tabs_.empty()) {
-                    SetKeyInputString(_T(""), input_handle_);
-                    if (auto card =
-                            tabs_.at(selecting_tab_index_).card.lock()) {
-                        card->onEnter(input_text);
-                    }
-                }
-                SetActiveKeyInput(input_handle_);
-            }
-        }
-    }
-
-    if (IsActive() && push_long_backspace && GetKeyInputCursorPosition(input_handle_) == 0) {
-        if (selecting_tab_index_ == -1) {
-            script_tab_.message.clear();
-        } else {
-            tabs_.at(selecting_tab_index_).message.clear();
-        }
     }
 
     ProcessInputTabs(input);
     UpdateBase(input);
     UpdateTabs();
 
-    if (push_mouse_left) {
-        if (cursor_drag_count == 1) {
-            prev_cursor_pos_ = GetKeyInputCursorPosition(input_handle_);
-        }
-        cursor_drag_count++;
-        //input->CancelMouseLeft();
-    } else {
-        cursor_drag_count = 0;
-    }
-
-    if (first_key_shift) {
-        prev_cursor_pos_ = GetKeyInputCursorPosition(input_handle_);
-    }
-
-    input_x_ = x_ + BOX_SIDE_MARGIN;
-    input_y_ = y_ + BOX_TOP_MARGIN;
-    input_width_ = width_ - BOX_SIDE_MARGIN * 2;
-
-    bool hover = (x_ <= input->GetMouseX() && input->GetMouseX() <= x_ + width_
-            && y_ <= input->GetMouseY() && input->GetMouseY() <= y_ + height_);
-    if (push_mouse_left && hover) {
-        auto pos = input->GetMousePos();
-        int internal_x = input_x_ + INPUT_MARGIN_X;
-        int internal_y = input_y_ + INPUT_MARGIN_Y;
-        cursor_moveto_x_ = pos.first - internal_x;
-        cursor_moveto_y_ = pos.second - internal_y;
-        ResetCursorCount();
-        input->CancelMouseLeft();
-    }
-
-    if (cursor_drag_count > 1) {
-        SetKeyInputSelectArea(GetKeyInputCursorPosition(input_handle_),
-                prev_cursor_pos_, input_handle_);
-    }
-
-    // カーソル移動中は強制表示
-    if (input->GetKeyCount(KEY_INPUT_RIGHT) > 0
-            || input->GetKeyCount(KEY_INPUT_LEFT) > 0) {
-
-        ResetCursorCount();
-    }
-
-    if (push_repeat_key_up) {
-        cursor_moveto_y_ = cursor_y_ - font_height_ / 2;
-        cursor_moveto_x_ = cursor_x_ + 2;
-    } else if (push_repeat_key_down) {
-        cursor_moveto_y_ = cursor_y_ + font_height_ + font_height_ / 2;
-        cursor_moveto_x_ = cursor_x_ + 2;
-    }
-
-    if (push_key_shift && push_repeat_key_return && multiline_) {
 
-        auto buffer = GetInputString();
-        uint32_t pos = GetKeyInputCursorPosition(input_handle_);
+    int new_height = input_.height() + BOX_TOP_MARGIN + BOX_BOTTOM_MARGIN;
 
-        std::string cursor_front_str = buffer.substr(0, pos);       // カーソル前の文字列
-        std::string cursor_back_str = buffer.substr(pos);           // カーソル後の文字列
-        auto new_string = cursor_front_str + '\n' + cursor_back_str;
-
-        SetKeyInputString(unicode::ToTString(new_string).c_str(), input_handle_);
-        SetKeyInputCursorPosition(pos + 1, input_handle_);
-        CancelSelect();
-        cursor_drag_count = 0;
-    }
-
-    int cursor_byte_pos, cursor_dot_pos;
-    int draw_dot_pos = 0;
-
-    TCHAR String[1024];
-    GetKeyInputString(String, input_handle_);
-
-    // 単一行設定の時、最初の行だけを表示
-    if (!multiline_) {
-        tstring buffer(String, _tcslen(String));
-        size_t pos;
-        if ((pos = buffer.find('\n')) != std::string::npos) {
-            SetKeyInputString(buffer.substr(0, pos).c_str(), input_handle_);
-        }
-    }
-
-    int internal_width = input_width_ - INPUT_MARGIN_X * 2;
-    // int internal_height = input_height_ - INPUT_MARGIN * 2;
-
-    std::string* message = nullptr;
-    if (selecting_tab_index_ == -1) {
-        message = &script_tab_.message;
-    } else if (!tabs_.empty()) {
-        message = &tabs_[selecting_tab_index_].message;
-    }
-
-    message_lines_.clear();
-
-    if (message && message->size() > 0) {
-        int current_line = 0;
-        std::string line_buffer;
-        int line_width = 0;
-        int char_count = 0;
-        for (auto it = message->begin(); it != message->end(); ++it) {
-        #ifdef UNICODE
-            TCHAR c = *it;
-            int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
-        #else
-            unsigned char c = *it;
-            TCHAR string[2] = { 0, 0 };
-
-            int width = 0;
-            if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) {
-                string[0] = c;
-                string[1] = *(it + 1);
-                ++it;
-                width = GetDrawStringWidthToHandle(string, 2, font_handle_);
-                line_buffer += string[0];
-                line_buffer += string[1];
-                char_count += 2;
-            } else if (c == '\n') {
-                char_count++;
-            } else {
-                string[0] = c;
-                width = GetDrawStringWidthToHandle(string, 1, font_handle_);
-                line_buffer += string[0];
-                char_count++;
-            }
-        #endif
-
-            line_width += width;
-            if (c == '\n'
-                    || line_width > internal_width - font_height_ / 2) {
-                message_lines_.push_back(line_buffer);
-                current_line++;
-                line_buffer.clear();
-                line_width = 0;
-            }
-        }
-
-        message_lines_.push_back(line_buffer);
+    int screen_height;
+    GetScreenState(nullptr, &screen_height, nullptr);
+    if (y_ + height_ > screen_height - BOX_TOP_MARGIN) {
+        y_ -= new_height - height_;
+        // input_.set_y(y_ + BOX_TOP_MARGIN);
     }
 
-    if (IsActive()) {
-        // カーソル位置（byte）を取得
-        cursor_byte_pos = GetKeyInputCursorPosition(input_handle_);
-
-        // カーソルのドット単位の位置を取得する
-        cursor_dot_pos = GetDrawStringWidthToHandle(String, cursor_byte_pos,
-                font_handle_);
-        draw_dot_pos += cursor_dot_pos;
-
-        tstring cursor_front_str(String, cursor_byte_pos); // カーソル前の文字列
-        tstring cursor_back_str(String + cursor_byte_pos); // カーソル後の文字列
-
-        std::vector<tstring> clauses;                  // 入力中の文節
-        std::vector<tstring> candidates;               // 変換候補
-
-        lines_.clear();
-        selecting_lines_.clear();
-        clause_lines_.clear();
-        selecting_clause_lines_.clear();
-        candidates_.clear();
-
-        // 文節データを取得
-        // int selecting_clause = -1;
-        selecting_candidate_ = -1;
-
-        IMEINPUTDATA *ImeData = GetIMEInputData();
-        if (ImeData && IsActive()) {
-            for (int i = 0; i < ImeData->ClauseNum; i++) {
-                clauses.push_back(
-                        tstring(
-                                ImeData->InputString
-                                        + ImeData->ClauseData[i].Position,
-                                ImeData->ClauseData[i].Length));
-            }
-            selecting_clause_ = ImeData->SelectClause;
-
-            if (ImeData->CandidateNum > 0) {
-                for (int i = 0; i < ImeData->CandidateNum; i++) {
-                    candidates_.push_back(
-                            tstring(ImeData->CandidateList[i],
-                                    _tcslen(ImeData->CandidateList[i])));
-                }
-
-                selecting_candidate_ = ImeData->SelectCandidate;
-            }
-        }
-
-        // 選択範囲を取得
-        int select_start, select_end;
-        GetKeyInputSelectArea(&select_start, &select_end, input_handle_);
-        if (select_start > select_end) {
-            std::swap(select_start, select_end);
-        }
-
-        std::string line_buffer;
-        int line_width = 0;
-        int char_count = 0;
-
-        // カーソル前のデータを描画
-        for (auto it = cursor_front_str.begin(); it != cursor_front_str.end();
-                ++it) {
-            int prev_char_count = char_count;
-
-        #ifdef UNICODE
-            TCHAR c = *it;
-            int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
-        #else
-            unsigned char c = *it;
-            TCHAR string[2] = { 0, 0 };
-
-            int width = 0;
-            if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) {
-                string[0] = c;
-                string[1] = *(it + 1);
-                ++it;
-                width = GetDrawStringWidthToHandle(string, 2, font_handle_);
-                line_buffer += string[0];
-                line_buffer += string[1];
-                char_count += 2;
-            } else if (c == '\n') {
-                char_count++;
-            } else {
-                string[0] = c;
-                width = GetDrawStringWidthToHandle(string, 1, font_handle_);
-                line_buffer += string[0];
-                char_count++;
-            }
-        #endif
-
-            // 選択範囲を記録
-            if (select_start < char_count && char_count <= select_end) {
-                selecting_lines_.resize(static_cast<int>(lines_.size() + message_lines_.size()) + 1,
-                        std::pair<int, int>(99999, 0));
-                selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first = std::min(
-                        selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first, line_width);
-                selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second = std::max(
-                        selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second,
-                        line_width + std::max(width, 3));
-            }
-
-            if (line_width - width / 2 <= cursor_moveto_x_
-                    && cursor_moveto_x_ <= line_width + width
-                    && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
-                    && cursor_moveto_y_ <= (static_cast<int>(lines_.size() + message_lines_.size()) + 1) * font_height_) {
-                SetKeyInputCursorPosition(prev_char_count, input_handle_);
-                cursor_moveto_x_ = -1;
-                cursor_moveto_y_ = -1;
-            }
-
-            line_width += width;
-            if (c == '\n' || line_width > internal_width - font_height_ / 2) {
-                lines_.push_back(line_buffer);
-
-                if (cursor_moveto_x_ >= line_width
-                        && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
-                        && cursor_moveto_y_
-                                <= (static_cast<int>(lines_.size() + message_lines_.size()) + 1) * font_height_) {
-                    if (c == '\n') {
-                        SetKeyInputCursorPosition(char_count - 1,
-                                input_handle_);
-                    } else {
-                        SetKeyInputCursorPosition(char_count, input_handle_);
-                    }
-                    cursor_moveto_x_ = -1;
-                    cursor_moveto_y_ = -1;
-                }
-
-                line_buffer.clear();
-                line_width = 0;
-            }
-        }
-
-        cursor_x_ = line_width;
-        cursor_y_ = static_cast<int>(lines_.size() + message_lines_.size()) * font_height_;
-
-        // 変換中データを描画
-        for (uint32_t index = 0; index < clauses.size(); index++) {
-            for (auto it = clauses[index].begin(); it != clauses[index].end();
-                    ++it) {
-        #ifdef UNICODE
-            TCHAR c = *it;
-            int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
-        #else
-            unsigned char c = *it;
-            TCHAR string[2] = { 0, 0 };
-
-            int width = 0;
-            if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) {
-                string[0] = c;
-                string[1] = *(it + 1);
-                ++it;
-                width = GetDrawStringWidthToHandle(string, 2, font_handle_);
-                line_buffer += string[0];
-                line_buffer += string[1];
-                char_count += 2;
-            } else if (c == '\n') {
-                char_count++;
-            } else {
-                string[0] = c;
-                width = GetDrawStringWidthToHandle(string, 1, font_handle_);
-                line_buffer += string[0];
-                char_count++;
-            }
-        #endif
-
-                clause_lines_.resize(static_cast<int>(lines_.size() + message_lines_.size()) + 1,
-                        std::pair<int, int>(99999, 0));
-                clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first = std::min(
-                        clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first, line_width);
-                clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second = std::max(
-                        clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second, line_width + width);
-
-                if (index == static_cast<uint32_t>(selecting_clause_)) {
-                    selecting_clause_lines_.resize(static_cast<int>(lines_.size() + message_lines_.size()) + 1,
-                            std::pair<int, int>(99999, 0));
-                    selecting_clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first = std::min(
-                            selecting_clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first,
-                            line_width);
-                    selecting_clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second = std::max(
-                            selecting_clause_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second,
-                            line_width + width);
-                }
-
-                line_width += width;
-                if (line_width > internal_width - font_height_ / 2) {
-                    lines_.push_back(line_buffer);
-                    line_buffer.clear();
-                    line_width = 0;
-                }
-            }
-        }
-
-        // カーソル後のデータを描画
-        for (auto it = cursor_back_str.begin(); it != cursor_back_str.end();
-                ++it) {
-                  
-            int prev_char_count = char_count;
-
-        #ifdef UNICODE
-            TCHAR c = *it;
-            int width = GetDrawStringWidthToHandle(&c, 1, font_handle_);
-            line_buffer += unicode::ToString(tstring(&c, 1));
-        #else
-            unsigned char c = *it;
-            TCHAR string[2] = { 0, 0 };
-
-            int width = 0;
-            if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) {
-                string[0] = c;
-                string[1] = *(it + 1);
-                ++it;
-                width = GetDrawStringWidthToHandle(string, 2, font_handle_);
-                line_buffer += string[0];
-                line_buffer += string[1];
-                char_count += 2;
-            } else if (c == '\n') {
-                char_count++;
-            } else {
-                string[0] = c;
-                width = GetDrawStringWidthToHandle(string, 1, font_handle_);
-                line_buffer += string[0];
-                char_count++;
-            }
-        #endif
-
-            // 選択範囲を記録
-            if (select_start < char_count && char_count <= select_end) {
-                selecting_lines_.resize(static_cast<int>(lines_.size() + message_lines_.size()) + 1,
-                        std::pair<int, int>(99999, 0));
-                selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first = std::min(
-                        selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].first, line_width);
-                selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second = std::max(
-                        selecting_lines_[static_cast<int>(lines_.size() + message_lines_.size())].second,
-                        line_width + std::max(width, 3));
-            }
-
-            if (line_width - width / 2 <= cursor_moveto_x_
-                    && cursor_moveto_x_ <= line_width + width
-                    && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
-                    && cursor_moveto_y_ <= (static_cast<int>(lines_.size() + message_lines_.size()) + 1) * font_height_) {
-                SetKeyInputCursorPosition(prev_char_count, input_handle_);
-                cursor_moveto_x_ = -1;
-                cursor_moveto_y_ = -1;
-            }
-
-            line_width += width;
-            if (c == '\n' || line_width > internal_width - font_height_ / 2) {
-                lines_.push_back(line_buffer);
-
-                if (cursor_moveto_x_ >= line_width
-                        && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
-                        && cursor_moveto_y_
-                                <= (static_cast<int>(lines_.size() + message_lines_.size()) + 1) * font_height_) {
-                    if (c == '\n') {
-                        SetKeyInputCursorPosition(char_count - 1,
-                                input_handle_);
-                    } else {
-                        SetKeyInputCursorPosition(char_count, input_handle_);
-                    }
-                    cursor_moveto_x_ = -1;
-                    cursor_moveto_y_ = -1;
-                }
-                line_buffer.clear();
-                line_width = 0;
-            }
-        }
-
-        // バッファの残りを描画
-        lines_.push_back(line_buffer);
-
-        if (cursor_moveto_x_ >= line_width
-                && static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ <= cursor_moveto_y_
-                && static_cast<int>(cursor_moveto_y_) <= static_cast<int>(lines_.size() + message_lines_.size()) * font_height_) {
-            SetKeyInputCursorPosition(char_count, input_handle_);
-            cursor_moveto_x_ = -1;
-            cursor_moveto_y_ = -1;
-        }
-
-        input_height_ = static_cast<int>(lines_.size() + message_lines_.size()) * font_height_ + INPUT_MARGIN_Y * 2;
-        input_height_ = std::max(input_height_, min_input_height_);
-
-        int new_height = input_height_ + BOX_TOP_MARGIN + BOX_BOTTOM_MARGIN;
-
-        int screen_height;
-        GetScreenState(nullptr, &screen_height, nullptr);
-        if (y_ + height_ > screen_height - BOX_TOP_MARGIN) {
-            y_ -= new_height - height_;
-            input_y_ = y_ + BOX_TOP_MARGIN;
-        }
-
-        height_ = new_height;
+    height_ = new_height;
+        
+    input_.set_y(y_ + BOX_TOP_MARGIN);
+    input_.set_x(x_ + INPUT_MARGIN_X);
+    input_.set_width(width_ - INPUT_MARGIN_X * 2);
 
-        line_buffer.clear();
-        line_width = 0;
+        //line_buffer.clear();
+        //line_width = 0;
 
-        if (push_key_shift && (push_repeat_key_up || push_repeat_key_down)) {
-            SetKeyInputSelectArea(GetKeyInputCursorPosition(input_handle_),
-                    prev_cursor_pos_, input_handle_);
-        }
+        //if (push_key_shift && (push_repeat_key_up || push_repeat_key_down)) {
+        //    SetKeyInputSelectArea(GetKeyInputCursorPosition(input_handle_),
+        //            prev_cursor_pos_, input_handle_);
+        //}
 
-    }
+    //}
 
     if (IsActive()) {
         input->CancelKeyCountAll();
@@ -1061,8 +386,7 @@ void InputBox::ProcessInput(InputManager* input)
 
 void InputBox::Update()
 {
-    UpdateCursorCount();
- // if (IsActive) {
+    input_.Update();
 }
 
 void InputBox::ReloadTabs()
@@ -1076,7 +400,7 @@ void InputBox::ReloadTabs()
             if (card->HasInputEvent()) {
                 InputBox::Tab tab;
                 tab.card = card;
-                tab.name = card->name();
+                tab.name = unicode::ToTString(card->name());
 
                 tab.x = x_ + TAB_SIDE_MARGIN + tab_offset_x - 9;
                 tab.y = y_ - 3;
@@ -1136,8 +460,7 @@ void InputBox::UpdateTabs()
 
     // タブ選択
     int tab_offset_x = 0;
-        for (auto it = tabs_.begin(); it != tabs_.end(); ++it) {
-            auto tab = *it;
+    BOOST_FOREACH(auto& tab, tabs_) {
         tab.x = x_ + TAB_SIDE_MARGIN + tab_offset_x - 9;
         tab.y = y_ - 3;
         tab.height = font_height_ + TAB_TOP_MARGIN * 2 + 3 * 2;
@@ -1164,10 +487,10 @@ void InputBox::UpdateBase(InputManager* input)
     bool hover = (x_ <= input->GetMouseX() && input->GetMouseX() <= x_ + width_
             && y_ <= input->GetMouseY() && input->GetMouseY() <= y_ + height_);
 
-    bool input_hover = (input_x_ <= input->GetMouseX()
-            && input->GetMouseX() <= input_x_ + input_width_
-            && input_y_ <= input->GetMouseY()
-            && input->GetMouseY() <= input_y_ + input_height_);
+    //bool input_hover = (input_x_ <= input->GetMouseX()
+    //        && input->GetMouseX() <= input_x_ + input_width_
+    //        && input_y_ <= input->GetMouseY()
+    //        && input->GetMouseY() <= input_y_ + input_height_);
 
     bool corner_hover = (x_ + width_ - 18 <= input->GetMouseX()
             && input->GetMouseX() <= x_ + width_
@@ -1177,7 +500,7 @@ void InputBox::UpdateBase(InputManager* input)
     // ドラッグ処理
     if (input->GetMouseLeft()) {
         if (input->GetPrevMouseLeft() == 0 && drag_offset_x_ < 0 && hover
-                && !input_hover && !corner_hover) {
+                 && !corner_hover) {
             drag_offset_x_ = input->GetMouseX() - x_;
             drag_offset_y_ = input->GetMouseY() - y_;
         }
@@ -1217,17 +540,15 @@ void InputBox::UpdateBase(InputManager* input)
 
 bool InputBox::IsActive()
 {
-    return GetActiveKeyInput() == input_handle_;
+    return input_.active();
 }
 
 void InputBox::Activate()
 {
-    SetActiveKeyInput(input_handle_);
-    ResetCursorCount();
+    input_.set_active(true);
 }
 
 void InputBox::Inactivate()
 {
-    ReStartKeyInput(input_handle_);
-    SetActiveKeyInput(-1);
+    input_.set_active(false);
 }

--- a/client/ui/InputBox.hpp
+++ b/client/ui/InputBox.hpp
@@ -12,6 +12,7 @@
 #include "../ScriptEnvironment.hpp"
 #include "../ResourceManager.hpp"
 #include "../Card.hpp"
+#include "Input.hpp"
 
 class InputBox {
     public:
@@ -33,25 +34,17 @@ class InputBox {
     private:
         void CancelSelect();
 
-        void UpdateCursorCount();
-        void ResetCursorCount();
-
         void DrawBase();
         void DrawTabs();
-        void DrawInputBase();
-        void DrawInputText();
-        void DrawCandidates();
 
         void ProcessInputTabs(InputManager* input);
         void UpdateTabs();
 
         void UpdateBase(InputManager* input);
 
-        void AddInputHistory(const std::string& text);
-
         void SwitchTab(int index);
-        std::string GetInputString() const;
-        void SetInputString(const std::string& text);
+        tstring GetInputString() const;
+        void SetInputString(const tstring& text);
 
         bool IsScriptMode();
         void SetScriptMode();
@@ -63,17 +56,17 @@ class InputBox {
     private:
         struct Tab {
             CardWeakPtr card;
-            std::string name;
-            std::string message;
-            std::string text;
+            tstring name;
+            tstring message;
+            tstring text;
             int x, y, width, height;
         };
 
-        int input_handle_;
+        Input input_;
+
         int font_handle_;
         int font_height_;
         std::array<ImageHandlePtr, 4> bg_image_handle_;
-        std::array<ImageHandlePtr, 4> input_bg_image_handle_;
         std::array<ImageHandlePtr, 4> tab_bg_image_handle_;
         std::array<ImageHandlePtr, 4> tab_bg_inactive_image_handle_;
         std::array<ImageHandlePtr, 4> ime_image_handle_;
@@ -83,30 +76,12 @@ class InputBox {
         int drag_resize_offset_x_, drag_resize_offset_y_;
         int min_input_height_;
 
-        int input_x_, input_y_, input_width_, input_height_;
-        int cursor_x_, cursor_y_;
-        int cursor_moveto_x_, cursor_moveto_y_;
-        int prev_cursor_pos_, cursor_drag_count;
-        int selecting_candidate_, selecting_clause_;
-        int candidate_x_, candidate_y_;
-
         int selecting_tab_index_;
         std::vector<InputBox::Tab> tabs_;
         Tab script_tab_;
 
-        std::vector<std::string> message_lines_;
-        std::vector<std::string> lines_;
-        std::vector<tstring> candidates_;
-
-        std::list<std::string> history_;
-
-        std::vector<std::pair<int, int>> selecting_lines_;
-        std::vector<std::pair<int, int>> clause_lines_;
-        std::vector<std::pair<int, int>> selecting_clause_lines_;
-
         std::vector<std::string> tab_texts_;
 
-        int blink_count_;
         ManagerAccessorPtr manager_accessor_;
         CardPtr card_;
 

--- a/common/network/Command.hpp
+++ b/common/network/Command.hpp
@@ -1,4 +1,4 @@
-//
+//
 // Command.hpp
 //
 

--- a/common/network/Encrypter.cpp
+++ b/common/network/Encrypter.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Encrypter.cpp
 //
 

--- a/common/network/Encrypter.hpp
+++ b/common/network/Encrypter.hpp
@@ -1,4 +1,4 @@
-//
+//
 // Encrypter.hpp
 //
 

--- a/server/main.cpp
+++ b/server/main.cpp
@@ -299,7 +299,7 @@ int main(int argc, char* argv[])
             shm(boost::interprocess::open_read_only, "MMO_SERVER_WITH_CLIENT");
         execute_with_client = true;
     } catch(std::exception& e) {
-        Logger::Info("Standalone Mode");
+        Logger::Info("Stand-alone Mode");
         execute_with_client = false;
     }