diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-04-09 12:51:51 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-04-09 12:51:51 (GMT) |
| commit | 887c0cff630cefa21066a3dae3da03267fb4882d (patch) | |
| tree | c81c0289058629d93a5ba6acec83816bd44a6299 | |
| parent | 3f7de958795b3d01851e611f2aaca65e3ab9e196 (diff) | |
| parent | b50c997b3834601c7ff959360ab907fbe0498c69 (diff) | |
| download | tk-887c0cff630cefa21066a3dae3da03267fb4882d.zip tk-887c0cff630cefa21066a3dae3da03267fb4882d.tar.gz tk-887c0cff630cefa21066a3dae3da03267fb4882d.tar.bz2 | |
[562118ce41] Fix wordstart modifier handling of multi-byte chars
| -rw-r--r-- | generic/tkTextIndex.c | 19 | ||||
| -rw-r--r-- | tests/textIndex.test | 10 |
2 files changed, 24 insertions, 5 deletions
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 418b934..564b4c3 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -2205,7 +2205,7 @@ StartEnd( TkText *textPtr, /* Information about text widget. */ const char *string, /* String to parse for additional info about * modifier (count and units). Points to first - * character of modifer word. */ + * character of modifier word. */ TkTextIndex *indexPtr) /* Index to modify based on string. */ { const char *p; @@ -2356,11 +2356,20 @@ StartEnd( } firstChar = 0; } - offset -= chSize; - indexPtr->byteIndex -= chSize; + if (offset == 0) { + if (modifier == TKINDEX_DISPLAY) { + TkTextIndexBackChars(textPtr, indexPtr, 1, indexPtr, + COUNT_DISPLAY_INDICES); + } else { + TkTextIndexBackChars(NULL, indexPtr, 1, indexPtr, + COUNT_INDICES); + } + } else { + indexPtr->byteIndex -= chSize; + } + offset -= chSize; if (offset < 0) { - if (indexPtr->byteIndex < 0) { - indexPtr->byteIndex = 0; + if (indexPtr->byteIndex == 0) { goto done; } segPtr = TkTextIndexToSeg(indexPtr, &offset); diff --git a/tests/textIndex.test b/tests/textIndex.test index dead9c1..465f097 100644 --- a/tests/textIndex.test +++ b/tests/textIndex.test @@ -905,6 +905,16 @@ test textIndex-22.12 {text index wordstart, unicode} { test textIndex-22.13 {text index wordstart, unicode} { text_test_word wordstart "\uc700\uc700 abc" 8 } 3 +test textIndex-22.14 {text index wordstart, unicode, start index at internal segment start} { + catch {destroy .t} + text .t + .t insert end "C'est du texte en fran\u00e7ais\n" + .t insert end "\u042D\u0442\u043E\u0020\u0442\u0435\u043A\u0441\u0442\u0020\u043D\u0430\u0020\u0440\u0443\u0441\u0441\u043A\u043E\u043C" + .t mark set insert 1.23 + set res [.t index "1.23 wordstart"] + .t mark set insert 2.16 + lappend res [.t index "2.16 wordstart"] [.t index "2.15 wordstart"] +} {1.18 2.13 2.13} test textIndex-22.15 {text index display wordstart} { catch {destroy .t} text .t |