From 0886c2753834971b6a004165c20e00e0cad9d585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Sat, 11 Jun 2016 15:46:27 +0300 Subject: [PATCH] libcore: Added conversion of DOS code page 437 to Unicode --- doomsday/sdk/libcore/include/de/charsymbols.h | 16 +++++ doomsday/sdk/libcore/include/de/data/string.h | 10 +++ doomsday/sdk/libcore/src/charsymbols.cpp | 64 +++++++++++++++++++ doomsday/sdk/libcore/src/data/string.cpp | 13 ++++ 4 files changed, 103 insertions(+) create mode 100644 doomsday/sdk/libcore/src/charsymbols.cpp diff --git a/doomsday/sdk/libcore/include/de/charsymbols.h b/doomsday/sdk/libcore/include/de/charsymbols.h index 123fe3bbdd..969c255a31 100644 --- a/doomsday/sdk/libcore/include/de/charsymbols.h +++ b/doomsday/sdk/libcore/include/de/charsymbols.h @@ -19,6 +19,8 @@ #ifndef LIBDENG2_CHARSYMBOLS_H #define LIBDENG2_CHARSYMBOLS_H +#include "libcore.h" + /** * @defgroup unicodeSymbols Unicode Symbols * Unicode key symbols. @ingroup types @@ -56,4 +58,18 @@ #endif /** @} */ +namespace de { + +/** + * Converts the IBM PC character set to the Unicode equivalents. + * See: https://en.wikipedia.org/wiki/Code_page_437 + * + * @param code Character code. + * + * @return Unicode character. + */ +DENG2_PUBLIC duint codePage437ToUnicode(dbyte code); + +} // namespace de + #endif // LIBDENG2_CHARSYMBOLS_H diff --git a/doomsday/sdk/libcore/include/de/data/string.h b/doomsday/sdk/libcore/include/de/data/string.h index 7c7fa3aae5..04281dd1b0 100644 --- a/doomsday/sdk/libcore/include/de/data/string.h +++ b/doomsday/sdk/libcore/include/de/data/string.h @@ -311,6 +311,16 @@ class DENG2_PUBLIC String : public QString */ static String fromLatin1(IByteArray const &byteArray); + /** + * Builds a String out of an array of bytes using the IBM PC character set + * (DOS code page 437). + * + * @param byteArray Characters to convert. + * + * @return Converted string. + */ + static String fromCP437(IByteArray const &byteArray); + static dint compareWithCase(QChar const *a, QChar const *b, dsize count); /** diff --git a/doomsday/sdk/libcore/src/charsymbols.cpp b/doomsday/sdk/libcore/src/charsymbols.cpp new file mode 100644 index 0000000000..2ba43192d9 --- /dev/null +++ b/doomsday/sdk/libcore/src/charsymbols.cpp @@ -0,0 +1,64 @@ +/** @file charsymbols.cpp Character (Unicode) symbols. + * + * @authors Copyright (c) 2016 Jaakko Keränen + * + * @par License + * LGPL: http://www.gnu.org/licenses/lgpl.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 3 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 Lesser + * General Public License for more details. You should have received a copy of + * the GNU Lesser General Public License along with this program; if not, see: + * http://www.gnu.org/licenses + */ + +#include "de/charsymbols.h" + +namespace de { + +static duint const codePage437[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, + 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 +}; + +duint codePage437ToUnicode(dbyte code) +{ + return codePage437[code]; +} + +} // namespace de diff --git a/doomsday/sdk/libcore/src/data/string.cpp b/doomsday/sdk/libcore/src/data/string.cpp index 49909d8a29..1bd94b7a15 100644 --- a/doomsday/sdk/libcore/src/data/string.cpp +++ b/doomsday/sdk/libcore/src/data/string.cpp @@ -20,6 +20,7 @@ #include "de/App" #include "de/String" #include "de/Block" +#include "de/charsymbols.h" #include #include @@ -708,6 +709,18 @@ String String::fromLatin1(IByteArray const &byteArray) return QString::fromLatin1(reinterpret_cast(Block(byteArray).data())); } +String String::fromCP437(IByteArray const &byteArray) +{ + Block const chars(byteArray); + String conv; + conv.reserve(byteArray.size()); + for (dbyte ch : chars) + { + conv.append(codePage437ToUnicode(ch)); + } + return conv; +} + size_t de::qchar_strlen(QChar const *str) { if (!str) return 0;