Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2014-07-16 16:17:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole" Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2014-06-19 13:15:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2014-07-16 16:18:06.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 22:19:47 UTC 2014 - [email protected] + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- Old: ---- konsole-4.13.2.tar.xz New: ---- konsole-4.13.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.vEljxb/_old 2014-07-16 16:18:07.000000000 +0200 +++ /var/tmp/diff_new_pack.vEljxb/_new 2014-07-16 16:18:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: konsole -Version: 4.13.2 +Version: 4.13.80 Release: 0 Summary: KDE Terminal License: GPL-2.0+ ++++++ konsole-4.13.2.tar.xz -> konsole-4.13.80.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/desktop/konsole.desktop new/konsole-4.13.80/desktop/konsole.desktop --- old/konsole-4.13.2/desktop/konsole.desktop 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/desktop/konsole.desktop 2014-07-09 05:02:21.000000000 +0200 @@ -191,6 +191,7 @@ [Desktop Action NewWindow] Name=Open a New Window +Name[ar]=افتح نافذة جديدة Name[bs]=Otvori u novom prozoru Name[ca]=Obre una finestra nova Name[ca@valencia]=Obri una finestra nova @@ -206,6 +207,7 @@ Name[he]=פתח חלון חדש Name[hu]=Új ablak megnyitása Name[ia]=Aperi un nove fenestra +Name[id]=Buka Jendela Baru Name[is]=Opna nýjan glugga Name[it]=Apri in una nuova finestra Name[ko]=새 창 열기 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/desktop/konsolehere.desktop new/konsole-4.13.80/desktop/konsolehere.desktop --- old/konsole-4.13.2/desktop/konsolehere.desktop 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/desktop/konsolehere.desktop 2014-07-09 05:02:21.000000000 +0200 @@ -91,7 +91,7 @@ Name[te]=టెర్మినల్ను ఇక్కడ తెరువుము Name[tg]=Терминалро дар ин ҷо кушоед Name[th]=เปิดเทอร์มินัลที่นี่ -Name[tr]=Terminali Burada Aç +Name[tr]=Uçbirimi Burada Aç Name[ug]=بۇ يەردە تېرمىنالنى ئاچ Name[uk]=Відкрити термінал Name[uz]=Terminalni shu yerda ochish diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/desktop/konsolerun.desktop new/konsole-4.13.80/desktop/konsolerun.desktop --- old/konsole-4.13.2/desktop/konsolerun.desktop 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/desktop/konsolerun.desktop 2014-07-09 05:02:21.000000000 +0200 @@ -11,6 +11,7 @@ Icon=utilities-terminal Name=Run In Konsole +Name[ar]=شغل في كونسول Name[ca]=Executa en el Konsole Name[ca@valencia]=Executa en el Konsole Name[cs]=Spustit v Konsoli @@ -25,6 +26,7 @@ Name[he]=הפעל בתוך Konsole Name[hu]=Futtatás a Konsole programban Name[ia]=Executa in Konsole +Name[id]=Jalankan Di Konsole Name[is]=Keyra í Konsole skjáhermi Name[it]=Esegui in Konsole Name[ko]=Konsole에서 실행 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/CharacterColor.h new/konsole-4.13.80/src/CharacterColor.h --- old/konsole-4.13.2/src/CharacterColor.h 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/CharacterColor.h 2014-07-09 05:02:21.000000000 +0200 @@ -95,7 +95,6 @@ * color and font weight. */ friend bool operator != (const ColorEntry& a, const ColorEntry& b); - }; inline bool operator == (const ColorEntry& a, const ColorEntry& b) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/EditProfileDialog.cpp new/konsole-4.13.80/src/EditProfileDialog.cpp --- old/konsole-4.13.2/src/EditProfileDialog.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/EditProfileDialog.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -1319,22 +1319,17 @@ painter->setBrush(gradient); painter->drawRoundRect(backgroundRect , 4 , 30); - //const bool isChecked = index.data(Qt::CheckStateRole) == Qt::Checked; const bool isSelected = option.state & QStyle::State_Selected; // draw border on selected items - if (isSelected) { //|| isChecked ) + if (isSelected) { static const int selectedBorderWidth = 6; painter->setBrush(QBrush(Qt::NoBrush)); QPen pen; QColor highlightColor = option.palette.highlight().color(); - - if (isSelected) - highlightColor.setAlphaF(1.0); - else - highlightColor.setAlphaF(0.7); + highlightColor.setAlphaF(1.0); pen.setBrush(highlightColor); pen.setWidth(selectedBorderWidth); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/Emulation.cpp new/konsole-4.13.80/src/Emulation.cpp --- old/konsole-4.13.2/src/Emulation.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/Emulation.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -79,8 +79,7 @@ ScreenWindow* Emulation::createWindow() { - ScreenWindow* window = new ScreenWindow(); - window->setScreen(_currentScreen); + ScreenWindow* window = new ScreenWindow(_currentScreen); _windows << window; connect(window , SIGNAL(selectionChanged()), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/LineFont.h new/konsole-4.13.80/src/LineFont.h --- old/konsole-4.13.2/src/LineFont.h 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/LineFont.h 2014-07-09 05:02:21.000000000 +0200 @@ -1,4 +1,4 @@ -// WARNING: Autogenerated by "fontembedder /Volumes/Projects/KDE/src/kde/applications/konsole/src/LineFont.src". +// WARNING: Autogenerated by "fontembedder LineFont.src". // You probably do not want to hand-edit this! static const quint32 LineChars[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/MainWindow.cpp new/konsole-4.13.80/src/MainWindow.cpp --- old/konsole-4.13.2/src/MainWindow.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/MainWindow.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -87,7 +87,7 @@ QMapIterator<QString, QString> i(configEntries); while (i.hasNext()) { i.next(); - if (i.key().startsWith(QLatin1String("Width")) + if (i.key().startsWith(QLatin1String("Width")) || i.key().startsWith(QLatin1String("Height"))) { group.deleteEntry(i.key()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/ScreenWindow.cpp new/konsole-4.13.80/src/ScreenWindow.cpp --- old/konsole-4.13.2/src/ScreenWindow.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/ScreenWindow.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -25,7 +25,7 @@ using namespace Konsole; -ScreenWindow::ScreenWindow(QObject* parent) +ScreenWindow::ScreenWindow(Screen* screen, QObject* parent) : QObject(parent) , _windowBuffer(0) , _windowBufferSize(0) @@ -36,6 +36,7 @@ , _trackOutput(true) , _scrollCount(0) { + setScreen(screen); } ScreenWindow::~ScreenWindow() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/ScreenWindow.h new/konsole-4.13.80/src/ScreenWindow.h --- old/konsole-4.13.2/src/ScreenWindow.h 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/ScreenWindow.h 2014-07-09 05:02:21.000000000 +0200 @@ -63,7 +63,7 @@ * to notify the window when the associated screen has changed and synchronize selection updates * between all views on a session. */ - explicit ScreenWindow(QObject* parent = 0); + explicit ScreenWindow(Screen* screen, QObject* parent = 0); virtual ~ScreenWindow(); /** Sets the screen which this window looks onto */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/TerminalCharacterDecoder.cpp new/konsole-4.13.80/src/TerminalCharacterDecoder.cpp --- old/konsole-4.13.2/src/TerminalCharacterDecoder.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/TerminalCharacterDecoder.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -262,7 +262,7 @@ } else { // HTML truncates multiple spaces, so use a space marker instead // Use   instead of   so xmllint will work. - text.append(" "); + text.append(" "); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/TerminalDisplay.cpp new/konsole-4.13.80/src/TerminalDisplay.cpp --- old/konsole-4.13.2/src/TerminalDisplay.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/TerminalDisplay.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -2913,7 +2913,6 @@ _gridLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding), 1, 0); - } // Remove message after a few seconds if (suspended) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/Vt102Emulation.cpp new/konsole-4.13.80/src/Vt102Emulation.cpp --- old/konsole-4.13.2/src/Vt102Emulation.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/Vt102Emulation.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -642,6 +642,8 @@ case TY_CSI_PN('B' ) : _currentScreen->cursorDown (p ); break; //VT100 case TY_CSI_PN('C' ) : _currentScreen->cursorRight (p ); break; //VT100 case TY_CSI_PN('D' ) : _currentScreen->cursorLeft (p ); break; //VT100 + case TY_CSI_PN('E' ) : /* Not implemented: cursor next p lines */ break; //VT100 + case TY_CSI_PN('F' ) : /* Not implemented: cursor preceding p lines */ break; //VT100 case TY_CSI_PN('G' ) : _currentScreen->setCursorX (p ); break; //LINUX case TY_CSI_PN('H' ) : _currentScreen->setCursorYX (p, q); break; //VT100 case TY_CSI_PN('I' ) : _currentScreen->tab (p ); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/fontembedder.cpp new/konsole-4.13.80/src/fontembedder.cpp --- old/konsole-4.13.2/src/fontembedder.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/fontembedder.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -76,6 +76,9 @@ QTextStream input(&inFile); + // Currently, for Konsole, the input glyphs file ranges from 0x2500 + // (9472) to x257f (9599) so this 128 will handle it. However, if + // more glyphs are added to the input file, this will be an issue. quint32 glyphStates[128]; QMap<quint32, int> glyphMap; @@ -92,19 +95,20 @@ //Must be a glyph ID. int glyph = line.toInt(0, 16); - if ((glyph < 0x2500) || (glyph > 0x257f)) - qFatal("Invalid glyph number"); - - glyph = glyph - 0x2500; - - glyphStates[glyph] = readGlyph(input); - // kWarning()<<glyph<<";"<<glyphStates[glyph]; - - if (glyphMap.contains(glyphStates[glyph])) { - kWarning()<<"Code "<<glyph<<" and "<<glyphMap.value(glyphStates[glyph])<<"have the same glyph state"<<glyphStates[glyph]; + if ((glyph < 0x2500) || (glyph > 0x257f)) { + qWarning("Invalid glyph number: %d aborting...", glyph); + exit(1); + } else { + glyph = glyph - 0x2500; + + glyphStates[glyph] = readGlyph(input); + // kWarning()<<glyph<<";"<<glyphStates[glyph]; + + if (glyphMap.contains(glyphStates[glyph])) { + kWarning()<<"Code "<<glyph<<" and "<<glyphMap.value(glyphStates[glyph])<<"have the same glyph state"<<glyphStates[glyph]; + } + glyphMap[glyphStates[glyph]] = glyph; } - glyphMap[glyphStates[glyph]] = glyph; - } //Output. @@ -114,11 +118,13 @@ //Nicely formatted: 8 per line, 16 lines for (int line = 0; line < 128; line += 8) { - cout << "\t"; + cout << " "; for (int col = line; col < line + 8; ++col) { cout << "0x" << hex << setw(8) << setfill('0') << glyphStates[col]; - if (col != 127) + if (col != line + 7) cout << ", "; + else if (col != 127) + cout << ","; } cout << "\n"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/konsole_wcwidth.cpp new/konsole-4.13.80/src/konsole_wcwidth.cpp --- old/konsole-4.13.2/src/konsole_wcwidth.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/konsole_wcwidth.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -68,6 +68,7 @@ // Own #include "konsole_wcwidth.h" +#include "konsole_export.h" struct interval { unsigned long first; @@ -125,7 +126,7 @@ * in ISO 10646. */ -int konsole_wcwidth(quint16 oucs) +int KONSOLEPRIVATE_EXPORT konsole_wcwidth(quint16 oucs) { /* NOTE: It is not possible to compare quint16 with the new last four lines of characters, * therefore this cast is now necessary. @@ -221,102 +222,3 @@ return w; } -/* - * The following functions are the same as mk_wcwidth() and - * mk_wcwidth_cjk(), except that spacing characters in the East Asian - * Ambiguous (A) category as defined in Unicode Technical Report #11 - * have a column width of 2. This variant might be useful for users of - * CJK legacy encodings who want to migrate to UCS without changing - * the traditional terminal character-width behaviour. It is not - * otherwise recommended for general use. - */ -int konsole_wcwidth_cjk(quint16 oucs) -{ - /* sorted list of non-overlapping intervals of East Asian Ambiguous - * characters, generated by - * - * uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf \ - * +E000..F8FF \ - * +F0000..FFFFD \ - * +100000..10FFFD c - * - * "WIDTH-A" is a file extracted from EastAsianWidth.txt by selecting - * only those with width "A", and omitting: - * - * 0xAD - * all lines with "COMBINING" - * - * http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt - * - * (uniset does not recognize the range expressions in WIDTH-A). - */ - static const struct interval ambiguous[] = { - { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 }, - { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 }, - { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 }, - { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 }, - { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED }, - { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA }, - { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 }, - { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B }, - { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 }, - { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 }, - { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 }, - { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE }, - { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 }, - { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA }, - { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 }, - { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB }, - { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB }, - { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 }, - { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 }, - { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 }, - { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 }, - { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 }, - { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 }, - { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 }, - { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC }, - { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 }, - { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 }, - { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 }, - { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 }, - { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 }, - { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 }, - { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B }, - { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 }, - { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 }, - { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E }, - { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 }, - { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 }, - { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F }, - { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 }, - { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF }, - { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B }, - { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 }, - { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, - { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, - { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, - { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 }, - { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 }, - { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 }, - { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 }, - { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F }, - { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF }, - { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } - }; - - /* binary search in table of non-spacing characters */ - if (bisearch(static_cast<unsigned long>(oucs), ambiguous, - sizeof(ambiguous) / sizeof(struct interval) - 1)) - return 2; - - return konsole_wcwidth(oucs); -} - -int string_width_cjk(const QString& text) -{ - int w = 0; - for (int i = 0; i < text.length(); ++i) - w += konsole_wcwidth_cjk(text[i].unicode()); - return w; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/konsole_wcwidth.h new/konsole-4.13.80/src/konsole_wcwidth.h --- old/konsole-4.13.2/src/konsole_wcwidth.h 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/konsole_wcwidth.h 2014-07-09 05:02:21.000000000 +0200 @@ -10,9 +10,7 @@ #include <QtCore/QString> int konsole_wcwidth(quint16 oucs); -int konsole_wcwidth_cjk(quint16 oucs); int string_width(const QString& text); -int string_width_cjk(const QString& text); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/main.cpp new/konsole-4.13.80/src/main.cpp --- old/konsole-4.13.2/src/main.cpp 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/main.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -29,7 +29,7 @@ #include <KCmdLineArgs> #include <KLocale> -#define KONSOLE_VERSION "2.13.2" +#define KONSOLE_VERSION "2.14" using Konsole::Application; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/tests/CMakeLists.txt new/konsole-4.13.80/src/tests/CMakeLists.txt --- old/konsole-4.13.2/src/tests/CMakeLists.txt 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/src/tests/CMakeLists.txt 2014-07-09 05:02:21.000000000 +0200 @@ -18,6 +18,9 @@ kde4_add_unit_test(CharacterColorTest CharacterColorTest.cpp) target_link_libraries(CharacterColorTest ${KONSOLE_TEST_LIBS}) +kde4_add_unit_test(CharacterWidthTest CharacterWidthTest.cpp) +target_link_libraries(CharacterWidthTest ${KONSOLE_TEST_LIBS}) + if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") kde4_add_unit_test(DBusTest DBusTest.cpp) target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/tests/CharacterWidthTest.cpp new/konsole-4.13.80/src/tests/CharacterWidthTest.cpp --- old/konsole-4.13.2/src/tests/CharacterWidthTest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/konsole-4.13.80/src/tests/CharacterWidthTest.cpp 2014-07-09 05:02:21.000000000 +0200 @@ -0,0 +1,73 @@ +/* + Copyright 2014 by Kurt Hindenburg <[email protected]> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. +*/ + +// Own +#include "CharacterWidthTest.h" + +// KDE +#include <qtest_kde.h> + +#include "../konsole_wcwidth.h" +#include "../konsole_export.h" + +using namespace Konsole; + +void CharacterWidthTest::testWidth_data() +{ + QTest::addColumn<quint16>("character"); + QTest::addColumn<int>("width"); + + /* This is a work in progress.... */ + + /* konsole_wcwidth uses -1 C0/C1 and DEL */ + QTest::newRow("0xE007F") << quint16(0xE007F) << -1; + + QTest::newRow("0x0300") << quint16(0x0300) << 0; + QTest::newRow("0x070F") << quint16(0x070F) << 0; + QTest::newRow("0x1160") << quint16(0x1160) << 0; + QTest::newRow("0x10300") << quint16(0x10300) << 0; + + QTest::newRow("a") << quint16('a') << 1; + QTest::newRow("0x00AD") << quint16(0x00AD) << 1; + QTest::newRow("0x00A0") << quint16(0x00A0) << 1; + QTest::newRow("0x10FB") << quint16(0x10FB) << 1; + QTest::newRow("0xFF76") << quint16(0xFF76) << 1; + QTest::newRow("0x103A0") << quint16(0x103A0) << 1; + QTest::newRow("0x10A06") << quint16(0x10A06) << 1; + + QTest::newRow("0x3000") << quint16(0x3000) << 2; + QTest::newRow("0x300a") << quint16(0x300a) << 2; + QTest::newRow("0x300b") << quint16(0x300b) << 2; + QTest::newRow("0xFF01") << quint16(0xFF01) << 2; + QTest::newRow("0xFF5F") << quint16(0xFF5F) << 2; + QTest::newRow("0xFF60") << quint16(0xFF60) << 2; + QTest::newRow("0xFFe0") << quint16(0xFFe6) << 2; +} + +void CharacterWidthTest::testWidth() +{ + QFETCH(quint16, character); + + QTEST(konsole_wcwidth(character), "width"); +} + +QTEST_KDEMAIN_CORE(CharacterWidthTest) + +#include "CharacterWidthTest.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/src/tests/CharacterWidthTest.h new/konsole-4.13.80/src/tests/CharacterWidthTest.h --- old/konsole-4.13.2/src/tests/CharacterWidthTest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/konsole-4.13.80/src/tests/CharacterWidthTest.h 2014-07-09 05:02:21.000000000 +0200 @@ -0,0 +1,42 @@ +/* + Copyright 2014 by Kurt Hindenburg <[email protected]> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. +*/ + +#ifndef CHARACTERWIDTHTEST_H +#define CHARACTERWIDTHTEST_H + +#include <QObject> + +namespace Konsole +{ + +class CharacterWidthTest : public QObject +{ + Q_OBJECT + +private slots: + + void testWidth_data(); + void testWidth(); + +}; + +} + +#endif // CHARACTERWIDTHTEST_H + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.13.2/tests/boxes.txt new/konsole-4.13.80/tests/boxes.txt --- old/konsole-4.13.2/tests/boxes.txt 2014-06-03 11:30:56.000000000 +0200 +++ new/konsole-4.13.80/tests/boxes.txt 2014-07-09 05:02:21.000000000 +0200 @@ -63,12 +63,80 @@ ╚╩╝ Double horizontal, single vertical. +┍┑ +┕┙ ╒╕ ╘╛ Double vertical, single horizontal. +┎┒ +┖┚ ╓╖ ╙╜ +Single width, double, triple and quadruple dash. +┌╌╌┐ ┌┄┄┐ ┌┈┈┐ +╎ ╎ ┆ ┆ ┊ ┊ +╎ ╎ ┆ ┆ ┊ ┊ +└╌╌┘ └┄┄┘ └┈┈┘ + +Double width, double, triple and quadruple dash. +┏╍╍┓ ┏┅┅┓ ┏┉┉┓ +╏ ╏ ┇ ┇ ┋ ┋ +╏ ╏ ┇ ┇ ┋ ┋ +┗╍╍┛ ┗┅┅┛ ┗┉┉┛ + +One single, two double lines meet. +┢┪ ┲┱ +┡┩ ┺┹ + +One double, two single lines meet. +┞┦ ┭┮ +┟┧ ┵┶ + +One single, three double lines meet. +╇ ╉╊ +╈ + +One double, three single lines meet. +╁ ┾┽ +╀ + +Two double, two single lines meet. +╆╅ +╄╃ + +Mixed width, starting, ending and changing width mid-character. +╷ ╻ ╶╼╸ +╽ ╿ ╺╾╴ +╹ ╵ + +Rounded. +╭─╮ +│ │ +╰─╯ + +Other. +╲ ╳ ╱ + +Block elements. + + ▐ ▌ ▛▀#▀▜ +▄▞▀ ▗▄▀▘ ▌▗▄▖▐ + ▌ ▐ #▐#▌# +▀▚▄ ▝▀▄▖ ▌▝▀▘▐ + ▐ ▌ ▙▄#▄▟ + +▁▂▃▄▅▆▇█ ▖# ▗# + ▉ ▌# ▐# +▔▇ ▊ ▐# ▌# + ▋ ▝# ▘# +░ ▌ +▒░ ▍ ▌# ▐# +▓▒░ ▉ ▎ ▚# ▞# +█▓▒░ ▕ ▏ ▐# ▌# + + VT-102: http://vt100.net/docs/vt102-ug/table5-13.html Unicode: http://www.unicode.org/charts/PDF/U2500.pdf + and http://www.unicode.org/charts/PDF/U2580.pdf -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
