Index: COPYING.Unicode =================================================================== --- COPYING.Unicode +++ /dev/null @@ -1,64 +0,0 @@ -This license applies to the original wcwidth.c which is used in -src/konsole_wcwidth.cpp. See that file for more info. - -EXHIBIT 1 -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE - - Unicode Data Files include all data files under the directories - http://www.unicode.org/Public/, http://www.unicode.org/reports/, - and http://www.unicode.org/cldr/data/. Unicode Data Files do not - include PDF online code charts under the directory - http://www.unicode.org/Public/. Software includes any source code - published in the Unicode Standard or under the directories - http://www.unicode.org/Public/, http://www.unicode.org/reports/, - and http://www.unicode.org/cldr/data/. - - NOTICE TO USER: Carefully read the following legal agreement. BY - DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S - DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU - UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS - AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT - DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR - SOFTWARE. - - COPYRIGHT AND PERMISSION NOTICE - - Copyright © 1991-2012 Unicode, Inc. All rights - reserved. Distributed under the Terms of Use in - http://www.unicode.org/copyright.html. - - Permission is hereby granted, free of charge, to any person - obtaining a copy of the Unicode data files and any associated - documentation (the "Data Files") or Unicode software and any - associated documentation (the "Software") to deal in the Data - Files or Software without restriction, including without - limitation the rights to use, copy, modify, merge, publish, - distribute, and/or sell copies of the Data Files or Software, and - to permit persons to whom the Data Files or Software are furnished - to do so, provided that (a) the above copyright notice(s) and this - permission notice appear with all copies of the Data Files or - Software, (b) both the above copyright notice(s) and this - permission notice appear in associated documentation, and (c) - there is clear notice in each modified Data File or in the - Software as well as in the documentation associated with the Data - File(s) or Software that the data or software has been modified. - - THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY - OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE - COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR - ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR - ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THE DATA FILES OR SOFTWARE. - - Except as contained in this notice, the name of a copyright holder - shall not be used in advertising or otherwise to promote the sale, - use or other dealings in these Data Files or Software without - prior written authorization of the copyright holder. - - Unicode and the Unicode logo are trademarks of Unicode, Inc. in - the United States and other countries. All third party trademarks - referenced herein are the property of their respective owners. Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt +++ src/CMakeLists.txt @@ -100,7 +100,6 @@ Vt102Emulation.cpp ZModemDialog.cpp PrintOptions.cpp - konsole_wcwidth.cpp WindowSystemInfo.cpp ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Window.xml ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml) Index: src/Character.h =================================================================== --- src/Character.h +++ src/Character.h @@ -26,6 +26,9 @@ // Konsole #include "CharacterColor.h" +// Qt +#include + namespace Konsole { typedef unsigned char LineProperty; @@ -155,6 +158,27 @@ return QChar(character).isSpace(); } } + + inline int width() const { + return width(character); + } + + static int width(uint ucs4) { + return wcwidth(wchar_t(ucs4)); + } + + static int stringWidth(const uint *ucs4Str, int len) { + int w = 0; + for (int i = 0; i < len; ++i) { + w += width(ucs4Str[i]); + } + return w; + } + + inline static int stringWidth(const QString &str) { + auto ucs4Str = str.toUcs4(); + return stringWidth(ucs4Str.constData(), ucs4Str.length()); + } }; inline bool operator ==(const Character &a, const Character &b) Index: src/Filter.cpp =================================================================== --- src/Filter.cpp +++ src/Filter.cpp @@ -40,7 +40,6 @@ // Konsole #include "Session.h" #include "TerminalCharacterDecoder.h" -#include "konsole_wcwidth.h" using namespace Konsole; @@ -225,8 +224,8 @@ if (_linePositions->value(i) <= position && position < nextLine) { startLine = i; - startColumn = string_width(buffer()->mid(_linePositions->value(i), - position - _linePositions->value(i))); + startColumn = Character::stringWidth(buffer()->mid(_linePositions->value(i), + position - _linePositions->value(i))); return; } } Index: src/Screen.cpp =================================================================== --- src/Screen.cpp +++ src/Screen.cpp @@ -27,7 +27,6 @@ #include // Konsole -#include "konsole_wcwidth.h" #include "TerminalCharacterDecoder.h" #include "History.h" #include "ExtendedCharTable.h" @@ -691,7 +690,7 @@ // We indicate the fact that a newline has to be triggered by // putting the cursor one right to the last column of the screen. - int w = konsole_wcwidth(c); + int w = Character::width(c); if (w < 0) { // Non-printable character Index: src/TerminalCharacterDecoder.cpp =================================================================== --- src/TerminalCharacterDecoder.cpp +++ src/TerminalCharacterDecoder.cpp @@ -26,7 +26,6 @@ #include // Konsole -#include "konsole_wcwidth.h" #include "ExtendedCharTable.h" #include "ColorScheme.h" @@ -138,9 +137,8 @@ ushort extendedCharLength = 0; const uint* chars = ExtendedCharTable::instance.lookupExtendedChar(characters[i].character, extendedCharLength); if (chars != nullptr) { - const QString s = QString::fromUcs4(chars, extendedCharLength); - plainText.append(s); - i += qMax(1, string_width(s)); + plainText.append(QString::fromUcs4(chars, extendedCharLength)); + i += qMax(1, Character::stringWidth(chars, extendedCharLength)); } else { ++i; } @@ -154,7 +152,7 @@ // of `dialog --infobox "qwe" 10 10` . if (characters[i].isRealCharacter || i <= realCharacterGuard) { plainText.append(QString::fromUcs4(&characters[i].character, 1)); - i += qMax(1, konsole_wcwidth(characters[i].character)); + i += qMax(1, characters[i].width()); } else { ++i; // should we 'break' directly here? } Index: src/TerminalDisplay.cpp =================================================================== --- src/TerminalDisplay.cpp +++ src/TerminalDisplay.cpp @@ -61,7 +61,6 @@ // Konsole #include "Filter.h" #include "konsoledebug.h" -#include "konsole_wcwidth.h" #include "TerminalCharacterDecoder.h" #include "Screen.h" #include "LineFont.h" @@ -1944,7 +1943,7 @@ const int cursorLocation = loc(cursorPosition().x(), cursorPosition().y()); Q_ASSERT(cursorLocation < _imageSize); - int charWidth = konsole_wcwidth(_image[cursorLocation].character); + int charWidth = _image[cursorLocation].width(); QRect cursorRect = imageToWidget(QRect(cursorPosition(), QSize(charWidth, 1))); update(cursorRect); } @@ -3398,7 +3397,7 @@ QRect TerminalDisplay::preeditRect() const { - const int preeditLength = string_width(_inputMethodData.preeditString); + const int preeditLength = Character::stringWidth(_inputMethodData.preeditString); if (preeditLength == 0) { return QRect(); Index: src/autotests/CharacterWidthTest.h =================================================================== --- src/autotests/CharacterWidthTest.h +++ src/autotests/CharacterWidthTest.h @@ -31,6 +31,8 @@ private Q_SLOTS: + bool systemUsesUtf8(); + void testWidth_data(); void testWidth(); Index: src/autotests/CharacterWidthTest.cpp =================================================================== --- src/autotests/CharacterWidthTest.cpp +++ src/autotests/CharacterWidthTest.cpp @@ -19,52 +19,79 @@ // Own #include "CharacterWidthTest.h" +#include + +// System +#include // KDE #include -#include "../konsole_wcwidth.h" -#include "konsoleprivate_export.h" - using namespace Konsole; +bool CharacterWidthTest::systemUsesUtf8() +{ + const char *ctype = setlocale(LC_CTYPE, ""); + if (ctype != nullptr) { + if (QString::fromLatin1(ctype).endsWith(QString::fromLatin1("UTF-8"))) + return true; + } + return false; +} + void CharacterWidthTest::testWidth_data() { QTest::addColumn("character"); QTest::addColumn("width"); - /* This is a work in progress.... */ - - /* konsole_wcwidth uses -1 C0/C1 and DEL */ - QTest::newRow("0x007F") << uint(0x007F) << -1; - - QTest::newRow("0x0300") << uint(0x0300) << 0; - QTest::newRow("0x070F") << uint(0x070F) << 0; - QTest::newRow("0x1160") << uint(0x1160) << 0; - QTest::newRow("0x10300") << uint(0x10300) << 1; - - QTest::newRow("a") << uint('a') << 1; - QTest::newRow("0x00AD") << uint(0x00AD) << 1; - QTest::newRow("0x00A0") << uint(0x00A0) << 1; - QTest::newRow("0x10FB") << uint(0x10FB) << 1; - QTest::newRow("0xFF76") << uint(0xFF76) << 1; - QTest::newRow("0x103A0") << uint(0x103A0) << 1; - QTest::newRow("0x10A06") << uint(0x10A06) << 0; - - QTest::newRow("0x3000") << uint(0x3000) << 2; - QTest::newRow("0x300a") << uint(0x300a) << 2; - QTest::newRow("0x300b") << uint(0x300b) << 2; - QTest::newRow("0xFF01") << uint(0xFF01) << 2; - QTest::newRow("0xFF5F") << uint(0xFF5F) << 2; - QTest::newRow("0xFF60") << uint(0xFF60) << 2; - QTest::newRow("0xFFe0") << uint(0xFFe6) << 2; + // We can't test too much - results depend on libc version, widths changed in + // the past, and will change in the future. However, code points below are + // probably too common to change. + + // Control characters + for (uint cp = 0x01; cp <= 0x1F; ++cp) { + QTest::addRow("U+%04X", cp) << cp << -1; + } + // Delete + QTest::addRow("U+%04X", uint(0x7F)) << uint(0x7F) << -1; + + // Basic Latin + for (uint cp = 0x20; cp <= 0x7E; ++cp) { + QTest::addRow("U+%04X", cp) << cp << 1; + } + + if (systemUsesUtf8()) { + // Hiragana + for (uint cp = 0x3041; cp <= 0x3096; ++cp) { + QTest::addRow("U+%04X", cp) << cp << 2; + } + + // Combining Diacritical Marks (subset) + for (uint cp = 0x300; cp <= 0x30F; ++cp) { + QTest::addRow("U+%04X", cp) << cp << 0; + } + + // Test some CP > 0xFFFF to detect truncation + + // Mathematical bold capital A...Z, small A...Z + for (uint cp = 0x1D400; cp <= 0x1D433; ++cp) { + QTest::addRow("U+%04X", cp) << cp << 1; + } + + // CJK Ideograph Extension B (subset) + for (uint cp = 0x20000; cp <= 0x20010; ++cp) { + QTest::addRow("U+%04X", cp) << cp << 2; + } + } else { + QWARN("System locale does not use UTF-8. Limiting the test to code points <= 0xFF"); + } } void CharacterWidthTest::testWidth() { QFETCH(uint, character); - QTEST(konsole_wcwidth(character), "width"); + QTEST(Character::width(character), "width"); } QTEST_GUILESS_MAIN(CharacterWidthTest) Index: src/konsole_wcwidth.h =================================================================== --- src/konsole_wcwidth.h +++ /dev/null @@ -1,16 +0,0 @@ -/* $XFree86: xc/programs/xterm/wcwidth.h,v 1.5 2005/05/03 00:38:25 dickey Exp $ */ - -/* Markus Kuhn -- 2001-01-12 -- public domain */ -/* Adaptions for KDE by Waldo Bastian */ - -#ifndef KONSOLE_WCWIDTH_H -#define KONSOLE_WCWIDTH_H - -// Qt -#include - -int konsole_wcwidth(uint ucs); - -int string_width(const QString &text); - -#endif Index: src/konsole_wcwidth.cpp =================================================================== --- src/konsole_wcwidth.cpp +++ /dev/null @@ -1,238 +0,0 @@ -// krazy:excludeall=copyright,license -// krazy does not recognize Unicode License/Copyright see COPYING.Unicode - -/* $XFree86: xc/programs/xterm/wcwidth.characters,v 1.9 2006/06/19 00:36:52 dickey Exp $ */ - -/* - * This is an implementation of wcwidth() and wcswidth() (defined in - * IEEE Std 1002.1-2001) for Unicode. - * - * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html - * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html - * - * In fixed-width output devices, Latin characters all occupy a single - * "cell" position of equal width, whereas ideographic CJK characters - * occupy two such cells. Interoperability between terminal-line - * applications and (teletype-style) character terminals using the - * UTF-8 encoding requires agreement on which character should advance - * the cursor by how many cell positions. No established formal - * standards exist at present on which Unicode character shall occupy - * how many cell positions on character terminals. These routines are - * a first attempt of defining such behavior based on simple rules - * applied to data provided by the Unicode Consortium. - * - * For some graphical characters, the Unicode standard explicitly - * defines a character-cell width via the definition of the East Asian - * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes. - * In all these cases, there is no ambiguity about which width a - * terminal shall use. For characters in the East Asian Ambiguous (A) - * class, the width choice depends purely on a preference of backward - * compatibility with either historic CJK or Western practice. - * Choosing single-width for these characters is easy to justify as - * the appropriate long-term solution, as the CJK practice of - * displaying these characters as double-width comes from historic - * implementation simplicity (8-bit encoded characters were displayed - * single-width and 16-bit ones double-width, even for Greek, - * Cyrillic, etc.) and not any typographic considerations. - * - * Much less clear is the choice of width for the Not East Asian - * (Neutral) class. Existing practice does not dictate a width for any - * of these characters. It would nevertheless make sense - * typographically to allocate two character cells to characters such - * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be - * represented adequately with a single-width glyph. The following - * routines at present merely assign a single-cell width to all - * neutral characters, in the interest of simplicity. This is not - * entirely satisfactory and should be reconsidered before - * establishing a formal standard in this area. At the moment, the - * decision which Not East Asian (Neutral) characters should be - * represented by double-width glyphs cannot yet be answered by - * applying a simple rule from the Unicode database content. Setting - * up a proper standard for the behavior of UTF-8 character terminals - * will require a careful analysis not only of each Unicode character, - * but also of each presentation form, something the author of these - * routines has avoided to do so far. - * - * http://www.unicode.org/unicode/reports/tr11/ - * - * Markus Kuhn -- 2007-05-25 (Unicode 5.0) - * - * Permission to use, copy, modify, and distribute this software - * for any purpose and without fee is hereby granted. The author - * disclaims all warranties with regard to this software. - * - * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c - */ -/* - * Adaptions for KDE by Waldo Bastian and - * Francesco Cecconi - * See COPYING.Unicode for the license for the original wcwidth.c - */ - -// Own -#include "konsole_wcwidth.h" -#include "konsoleprivate_export.h" - -// Qt -#include - -struct interval { - unsigned long first; - unsigned long last; -}; - -/* auxiliary function for binary search in interval table */ -static int bisearch(unsigned long ucs, const struct interval* table, int max) -{ - int min = 0; - - if (ucs < table[0].first || ucs > table[max].last) { - return 0; - } - while (max >= min) { - const int mid = (min + max) / 2; - if (ucs > table[mid].last) { - min = mid + 1; - } else if (ucs < table[mid].first) { - max = mid - 1; - } else { - return 1; - } - } - - return 0; -} - -/* The following functions define the column width of an ISO 10646 - * character as follows: - * - * - The null character (U+0000) has a column width of 0. - * - * - Other C0/C1 control characters and DEL will lead to a return - * value of -1. - * - * - Non-spacing and enclosing combining characters (general - * category code Mn or Me in the Unicode database) have a - * column width of 0. - * - * - Other format characters (general category code Cf in the Unicode - * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0. - * - * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF) - * have a column width of 0. - * - * - Spacing characters in the East Asian Wide (W) or East Asian - * FullWidth (F) category as defined in Unicode Technical - * Report #11 have a column width of 2. - * - * - All remaining characters (including all printable - * ISO 8859-1 and WGL4 characters, Unicode control characters, - * etc.) have a column width of 1. - * - * This implementation assumes that quint16 characters are encoded - * in ISO 10646. - */ - -int KONSOLEPRIVATE_EXPORT konsole_wcwidth(uint ucs) -{ - /* sorted list of non-overlapping intervals of non-spacing characters */ - /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ - static const struct interval combining[] = { - { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, - { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, - { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, - { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, - { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, - { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, - { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, - { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, - { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, - { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, - { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, - { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, - { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, - { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, - { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, - { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, - { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, - { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, - { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, - { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, - { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, - { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, - { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, - { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, - { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, - { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, - { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, - { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, - { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, - { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, - { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, - { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, - { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, - { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, - { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, - { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, - { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, - { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, - { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, - { 0xE0100, 0xE01EF } - }; - - /* test for 8-bit control characters */ - if (ucs == 0 || QChar::isLowSurrogate(ucs)) { - return 0; - } - - /* Always assume double width, otherwise we have to go back and move characters */ - if (QChar::isHighSurrogate(ucs)) { - return 2; - } - - if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) { - return -1; - } - - /* binary search in table of non-spacing characters */ - if (bisearch(ucs, combining, - sizeof(combining) / sizeof(struct interval) - 1) != 0) { - return 0; - } - - /* if we arrive here, ucs is not a combining or C0/C1 control character */ - - return 1 + - static_cast(ucs >= 0x1100 && - (ucs <= 0x115f || /* Hangul Jamo init. consonants */ - ucs == 0x2329 || ucs == 0x232a || - (ucs >= 0x2e80 && ucs <= 0xa4cf && - ucs != 0x303f) || /* CJK ... Yi */ - (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ - (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ - (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ - (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ - (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ - (ucs >= 0xffe0 && ucs <= 0xffe6) || - (ucs >= 0x20000 && ucs <= 0x2fffd) || - (ucs >= 0x30000 && ucs <= 0x3fffd))); -} - -int string_width(const QString& text) -{ - int w = 0; - auto ucs4 = text.toUcs4(); - for (auto i : ucs4) { - w += konsole_wcwidth(i); - } - return w; -} -