mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle non-ASCII characters when selecting a word or moving the cursor by one word.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12149 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-12-17 07:42:54 +00:00
parent d0f6ef5d32
commit 936486cb1c
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FL/Fl_Text_Buffer.H
View File

@ -699,6 +699,7 @@ public:
to be informed if file input required transcoding to UTF-8.
*/
void (*transcoding_warning_action)(Fl_Text_Buffer*);
bool is_word_separator(int pos) const;
protected:

28
src/Fl_Text_Buffer.cxx
View File

@ -825,17 +825,29 @@ int Fl_Text_Buffer::line_end(int pos) const {
}
/** Returns whether character at position \p pos is a word separator.
Pos must be at a character boundary.
*/
bool Fl_Text_Buffer::is_word_separator(int pos) const {
int c = char_at(pos);
if (c < 128) {
return !(isalnum(c) || c == '_'); // non alphanumeric ASCII
}
return (c == 0xA0 || // NO-BREAK SPACE
(c >= 0x3000 && c <= 0x301F) // IDEOGRAPHIC punctuation
);
}
/*
Find the beginning of a word.
NOT UNICODE SAFE.
*/
int Fl_Text_Buffer::word_start(int pos) const {
// FIXME: character is ucs-4
while (pos>0 && (isalnum(char_at(pos)) || char_at(pos) == '_')) {
while (pos > 0 && !is_word_separator(pos))
{
pos = prev_char(pos);
}
// FIXME: character is ucs-4
if (!(isalnum(char_at(pos)) || char_at(pos) == '_'))
}
if (is_word_separator(pos))
pos = next_char(pos);
return pos;
}
@ -843,11 +855,9 @@ int Fl_Text_Buffer::word_start(int pos) const {
/*
Find the end of a word.
NOT UNICODE SAFE.
*/
int Fl_Text_Buffer::word_end(int pos) const {
// FIXME: character is ucs-4
while (pos < length() && (isalnum(char_at(pos)) || char_at(pos) == '_'))
while (pos < length() && !is_word_separator(pos))
{
pos = next_char(pos);
}

17
src/Fl_Text_Display.cxx
View File

@ -1537,24 +1537,17 @@ int Fl_Text_Display::rewind_lines(int startPos, int nLines) {
static inline int fl_isseparator(unsigned int c) {
// FIXME: this does not take UCS-4 encoding into account
return c != '$' && c != '_' && (isspace(c) || ispunct(c));
}
/**
\brief Moves the current insert position right one word.
*/
void Fl_Text_Display::next_word() {
int pos = insert_position();
while (pos < buffer()->length() && !fl_isseparator(buffer()->char_at(pos))) {
while (pos < buffer()->length() && !buffer()->is_word_separator(pos)) {
pos = buffer()->next_char(pos);
}
while (pos < buffer()->length() && fl_isseparator(buffer()->char_at(pos))) {
while (pos < buffer()->length() && buffer()->is_word_separator(pos)) {
pos = buffer()->next_char(pos);
}
@ -1571,15 +1564,15 @@ void Fl_Text_Display::previous_word() {
if (pos==0) return;
pos = buffer()->prev_char(pos);
while (pos && fl_isseparator(buffer()->char_at(pos))) {
while (pos && buffer()->is_word_separator(pos)) {
pos = buffer()->prev_char(pos);
}
while (pos && !fl_isseparator(buffer()->char_at(pos))) {
while (pos && !buffer()->is_word_separator(pos)) {
pos = buffer()->prev_char(pos);
}
if (fl_isseparator(buffer()->char_at(pos))) {
if (buffer()->is_word_separator(pos)) {
pos = buffer()->next_char(pos);
}