0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix_2694' into 1.14

Browse source 
Manual merge of pull request #2697.
This commit is contained in:
Jyrki Vesterinen 2018-03-25 16:01:07 +03:00
commit e6b411d21a
2 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/gui/widgets/text_box_base.cpp
View file

@ -37,9 +37,8 @@ text_box_base::text_box_base(const implementation::builder_styled_widget& builde
, text_()
, selection_start_(0)
, selection_length_(0)
, ime_in_progress_(false)
, ime_composing_(false)
, ime_start_point_(0)
, ime_length_(0)
, cursor_timer_(0)
, cursor_alpha_(0)
, cursor_blink_rate_ms_(750)
@ -164,10 +163,24 @@ void text_box_base::insert_char(const utf8::string& unicode)
}
}
size_t text_box_base::get_composition_length() const
{
if(!is_composing()) {
return 0;
}
size_t text_length = utf8::size(text_.text());
size_t text_cached_length = utf8::size(text_cached_);
if(text_length < text_cached_length) {
return 0;
}
return utf8::size(text_.text()) - utf8::size(text_cached_);
}
void text_box_base::interrupt_composition()
{
ime_in_progress_ = false;
ime_length_ = 0;
ime_composing_ = false;
// We need to inform the IME that text input is no longer in progress.
SDL_StopTextInput();
SDL_StartTextInput();
@ -382,6 +395,11 @@ void text_box_base::handle_key_backspace(SDL_Keymod /*modifier*/, bool& handled)
delete_selection();
} else if(selection_start_) {
delete_char(true);
if(is_composing()) {
if(get_composition_length() == 0) {
ime_composing_ = false;
}
}
}
fire(event::NOTIFY_MODIFIED, *this, nullptr);
}
@ -395,6 +413,11 @@ void text_box_base::handle_key_delete(SDL_Keymod /*modifier*/, bool& handled)
delete_selection();
} else if(selection_start_ < text_.get_length()) {
delete_char(false);
if(is_composing()) {
if(get_composition_length() == 0) {
ime_composing_ = false;
}
}
}
fire(event::NOTIFY_MODIFIED, *this, nullptr);
}
@ -405,10 +428,9 @@ void text_box_base::handle_commit(bool& handled, const utf8::string& unicode)
if(unicode.size() > 1 || unicode[0] != 0) {
handled = true;
if(ime_in_progress_) {
set_selection(ime_start_point_ + ime_length_, 0);
ime_in_progress_ = false;
ime_length_ = 0;
if(is_composing()) {
set_selection(ime_start_point_ + get_composition_length(), 0);
ime_composing_ = false;
} else {
insert_char(unicode);
}
@ -425,8 +447,8 @@ void text_box_base::handle_editing(bool& handled, const utf8::string& unicode, i
if(unicode.size() > 1 || unicode[0] != 0) {
handled = true;
size_t new_len = utf8::size(unicode);
if(!ime_in_progress_) {
ime_in_progress_ = true;
if(!is_composing()) {
ime_composing_ = true;
delete_selection();
ime_start_point_ = selection_start_;
text_cached_ = text_.text();
@ -445,17 +467,16 @@ void text_box_base::handle_editing(bool& handled, const utf8::string& unicode, i
// If length of composition text is more than the limit, it is separated to multiple SDL_TextEditingEvent
// start is start position of the separated event in entire composition text
if(start == 0) {
ime_length_ = 0;
text_.set_text(text_cached_, false);
}
ime_length_ += new_len;
text_.insert_text(ime_start_point_ + start, unicode);
// Update status
set_cursor(ime_start_point_, false);
if(ime_length_ > 0) {
int ime_length = get_composition_length();
if(ime_length > 0) {
int maximum_length = text_.get_maximum_length();
int cursor_end = std::min(maximum_length, ime_start_point_ + ime_length_);
int cursor_end = std::min(maximum_length, ime_start_point_ + ime_length);
set_cursor(cursor_end, true);
}
update_canvas();
@ -587,7 +608,7 @@ void text_box_base::signal_handler_sdl_key_down(const event::ui_event event,
case SDLK_RETURN:
case SDLK_KP_ENTER:
if(!ime_in_progress_ || (modifier & (KMOD_CTRL | KMOD_ALT | KMOD_GUI | KMOD_SHIFT))) {
if(!is_composing() || (modifier & (KMOD_CTRL | KMOD_ALT | KMOD_GUI | KMOD_SHIFT))) {
return;
}
// The IME will handle it, we just need to make sure nothing else handles it too.
@ -595,7 +616,7 @@ void text_box_base::signal_handler_sdl_key_down(const event::ui_event event,
break;
case SDLK_ESCAPE:
if(!ime_in_progress_ || (modifier & (KMOD_CTRL | KMOD_ALT | KMOD_GUI | KMOD_SHIFT))) {
if(!is_composing() || (modifier & (KMOD_CTRL | KMOD_ALT | KMOD_GUI | KMOD_SHIFT))) {
return;
}
interrupt_composition();

13
src/gui/widgets/text_box_base.hpp
View file

@ -118,6 +118,9 @@ public:
void set_selection(size_t start, int length);
protected:
/** Get length of composition text by IME **/
size_t get_composition_length() const;
/**
* Moves the cursor to the end of the line.
*
@ -259,15 +262,10 @@ protected:
return ime_start_point_;
}
size_t get_composition_length() const
{
return ime_length_;
}
public:
bool is_composing() const
{
return ime_in_progress_;
return ime_composing_;
}
void interrupt_composition();
@ -317,9 +315,8 @@ private:
int selection_length_;
// Values to support input method editors
bool ime_in_progress_;
bool ime_composing_;
int ime_start_point_;
int ime_length_;
size_t cursor_timer_;