maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
terminal/src/types/ut_types/UtilsTests.cpp

335 lines
15 KiB
C++
Raw Normal View History

Fix crash when window width and height are too high (#1134) ## Summary of the Pull Request Currently, the program crashes with a window width or height greater than 32767 (accounting for window decorations). This can be caused when the `initialRows` and `initialColumns` settings are set too high (also depends on the font width and height). This fixes the issue by not allowing the window to expand beyond 32767x32767. ## References #843 - relocated the ClampToShortMax helper for reuse elsewhere
2019-06-05 01:31:36 +02:00
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.
#include "precomp.h"
#include "WexTestClass.h"
Change backslashes in include statements to forward slashes (#8205) Many include statements use forward slashes, while others use backwards slashes. This is inconsistent formatting. For this reason, I changed the backward slashes to forward slashes since that is the standard.
2020-11-25 22:02:10 +01:00
#include "../../inc/consoletaeftemplates.hpp"
Fix crash when window width and height are too high (#1134) ## Summary of the Pull Request Currently, the program crashes with a window width or height greater than 32767 (accounting for window decorations). This can be caused when the `initialRows` and `initialColumns` settings are set too high (also depends on the font width and height). This fixes the issue by not allowing the window to expand beyond 32767x32767. ## References #843 - relocated the ClampToShortMax helper for reuse elsewhere
2019-06-05 01:31:36 +02:00
Change backslashes in include statements to forward slashes (#8205) Many include statements use forward slashes, while others use backwards slashes. This is inconsistent formatting. For this reason, I changed the backward slashes to forward slashes since that is the standard.
2020-11-25 22:02:10 +01:00
#include "../inc/utils.hpp"
#include "../inc/colorTable.hpp"
Initializes conhost's Campbell color scheme in conhost order instead of ANSI/VT order (#1237) * Fix this * Swap the elements instead of having two whole tables * Add a unittest to make @miniksa happy
2019-07-26 00:03:00 +02:00
#include <conattrs.hpp>
Fix crash when window width and height are too high (#1134) ## Summary of the Pull Request Currently, the program crashes with a window width or height greater than 32767 (accounting for window decorations). This can be caused when the `initialRows` and `initialColumns` settings are set too high (also depends on the font width and height). This fixes the issue by not allowing the window to expand beyond 32767x32767. ## References #843 - relocated the ClampToShortMax helper for reuse elsewhere
2019-06-05 01:31:36 +02:00
using namespace WEX::Common;
using namespace WEX::Logging;
using namespace WEX::TestExecution;
using namespace Microsoft::Console::Utils;
class UtilsTests
{
TEST_CLASS(UtilsTests);
Initializes conhost's Campbell color scheme in conhost order instead of ANSI/VT order (#1237) * Fix this * Swap the elements instead of having two whole tables * Add a unittest to make @miniksa happy
2019-07-26 00:03:00 +02:00
TEST_METHOD(TestClampToShortMax);
utils: prevent the corruption of GUID strings (#2765)
2019-09-17 00:01:47 +02:00
TEST_METHOD(TestGuidToString);
Add support for more OSC color formats (#7578) * Correct the behaviour of parsing `rgb:R/G/B`. It should be interpreted as `RR/GG/BB` instead of `0R/0G/0B` * Add support for `rgb:RRR/GGG/BBB` and `rgb:RRRR/GGGG/BBBB`. The behaviour of 12 bit variants is to repeat the first digit at the end, e.g. `rgb:123/456/789` becomes `rgb:1231/4564/7897`. * Add support for `#` formats. We are following the rules of [XParseColor] by interpreting `#RGB` as `R000G000B000`. * Add support for XOrg app color names, which are supported by xterm, VTE and many other terminal emulators. * Multi-parameter OSC 4 is now supported. * The chaining of OSC 10-12 is not yet supported. But the parameter validation is relaxed by parsing the parameters as multi-params but only use the first one, which means `\e]10;rgb:R/G/B;` and `\e]10:rgb:R/G/B;invalid` will execute `OSC 10` with the first color correctly. This fixes some of the issues mentioned in #942 but not all of them. [XParseColor]: https://linux.die.net/man/3/xparsecolor Closes #3715
2020-10-15 02:29:10 +02:00
TEST_METHOD(TestSplitString);
Add support for paste filtering and bracketed paste mode (#9034) This adds "paste filtering" & "bracketed paste mode" to the Windows Terminal. I've moved the paste handling code in `TerminalControl` to `Microsoft::Console::Util` to be able to easily test it, and the paste transformer from `TerminalControl` to `TerminalCore`. Supersedes #7508 References #395 (overall bracketed paste support request) Tests added. Manually tested.
2021-02-08 14:11:01 +01:00
TEST_METHOD(TestFilterStringForPaste);
Add support for more OSC color formats (#7578) * Correct the behaviour of parsing `rgb:R/G/B`. It should be interpreted as `RR/GG/BB` instead of `0R/0G/0B` * Add support for `rgb:RRR/GGG/BBB` and `rgb:RRRR/GGGG/BBBB`. The behaviour of 12 bit variants is to repeat the first digit at the end, e.g. `rgb:123/456/789` becomes `rgb:1231/4564/7897`. * Add support for `#` formats. We are following the rules of [XParseColor] by interpreting `#RGB` as `R000G000B000`. * Add support for XOrg app color names, which are supported by xterm, VTE and many other terminal emulators. * Multi-parameter OSC 4 is now supported. * The chaining of OSC 10-12 is not yet supported. But the parameter validation is relaxed by parsing the parameters as multi-params but only use the first one, which means `\e]10;rgb:R/G/B;` and `\e]10:rgb:R/G/B;invalid` will execute `OSC 10` with the first color correctly. This fixes some of the issues mentioned in #942 but not all of them. [XParseColor]: https://linux.die.net/man/3/xparsecolor Closes #3715
2020-10-15 02:29:10 +02:00
TEST_METHOD(TestStringToUint);
TEST_METHOD(TestColorFromXTermColor);
void _VerifyXTermColorResult(const std::wstring_view wstr, DWORD colorValue);
void _VerifyXTermColorInvalid(const std::wstring_view wstr);
Fix crash when window width and height are too high (#1134) ## Summary of the Pull Request Currently, the program crashes with a window width or height greater than 32767 (accounting for window decorations). This can be caused when the `initialRows` and `initialColumns` settings are set too high (also depends on the font width and height). This fixes the issue by not allowing the window to expand beyond 32767x32767. ## References #843 - relocated the ClampToShortMax helper for reuse elsewhere
2019-06-05 01:31:36 +02:00
};
Initializes conhost's Campbell color scheme in conhost order instead of ANSI/VT order (#1237) * Fix this * Swap the elements instead of having two whole tables * Add a unittest to make @miniksa happy
2019-07-26 00:03:00 +02:00
void UtilsTests::TestClampToShortMax()
{
const short min = 1;
// Test outside the lower end of the range
const short minExpected = min;
auto minActual = ClampToShortMax(0, min);
VERIFY_ARE_EQUAL(minExpected, minActual);
// Test negative numbers
const short negativeExpected = min;
auto negativeActual = ClampToShortMax(-1, min);
VERIFY_ARE_EQUAL(negativeExpected, negativeActual);
// Test outside the upper end of the range
const short maxExpected = SHRT_MAX;
auto maxActual = ClampToShortMax(50000, min);
VERIFY_ARE_EQUAL(maxExpected, maxActual);
// Test within the range
const short withinRangeExpected = 100;
auto withinRangeActual = ClampToShortMax(withinRangeExpected, min);
VERIFY_ARE_EQUAL(withinRangeExpected, withinRangeActual);
}
utils: prevent the corruption of GUID strings (#2765)
2019-09-17 00:01:47 +02:00
void UtilsTests::TestGuidToString()
{
constexpr GUID constantGuid{
0x01020304, 0x0506, 0x0708, { 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10 }
};
constexpr std::wstring_view constantGuidString{ L"{01020304-0506-0708-090a-0b0c0d0e0f10}" };
auto generatedGuid{ GuidToString(constantGuid) };
VERIFY_ARE_EQUAL(constantGuidString.size(), generatedGuid.size());
VERIFY_ARE_EQUAL(constantGuidString, generatedGuid);
}
Add support for more OSC color formats (#7578) * Correct the behaviour of parsing `rgb:R/G/B`. It should be interpreted as `RR/GG/BB` instead of `0R/0G/0B` * Add support for `rgb:RRR/GGG/BBB` and `rgb:RRRR/GGGG/BBBB`. The behaviour of 12 bit variants is to repeat the first digit at the end, e.g. `rgb:123/456/789` becomes `rgb:1231/4564/7897`. * Add support for `#` formats. We are following the rules of [XParseColor] by interpreting `#RGB` as `R000G000B000`. * Add support for XOrg app color names, which are supported by xterm, VTE and many other terminal emulators. * Multi-parameter OSC 4 is now supported. * The chaining of OSC 10-12 is not yet supported. But the parameter validation is relaxed by parsing the parameters as multi-params but only use the first one, which means `\e]10;rgb:R/G/B;` and `\e]10:rgb:R/G/B;invalid` will execute `OSC 10` with the first color correctly. This fixes some of the issues mentioned in #942 but not all of them. [XParseColor]: https://linux.die.net/man/3/xparsecolor Closes #3715
2020-10-15 02:29:10 +02:00
void UtilsTests::TestSplitString()
{
std::vector<std::wstring_view> result;
result = SplitString(L"", L';');
VERIFY_ARE_EQUAL(0u, result.size());
result = SplitString(L"1", L';');
VERIFY_ARE_EQUAL(1u, result.size());
Improve OSC 8 Hyperlink parsing logic (#7962) This PR improves the OSC 8 Hyperlink parsing logic, by adding support to `:` in params. ## Validation Steps Performed Tests added & passed.
2020-12-03 01:33:29 +01:00
result = SplitString(L";", L';');
VERIFY_ARE_EQUAL(2u, result.size());
Add support for more OSC color formats (#7578) * Correct the behaviour of parsing `rgb:R/G/B`. It should be interpreted as `RR/GG/BB` instead of `0R/0G/0B` * Add support for `rgb:RRR/GGG/BBB` and `rgb:RRRR/GGGG/BBBB`. The behaviour of 12 bit variants is to repeat the first digit at the end, e.g. `rgb:123/456/789` becomes `rgb:1231/4564/7897`. * Add support for `#` formats. We are following the rules of [XParseColor] by interpreting `#RGB` as `R000G000B000`. * Add support for XOrg app color names, which are supported by xterm, VTE and many other terminal emulators. * Multi-parameter OSC 4 is now supported. * The chaining of OSC 10-12 is not yet supported. But the parameter validation is relaxed by parsing the parameters as multi-params but only use the first one, which means `\e]10;rgb:R/G/B;` and `\e]10:rgb:R/G/B;invalid` will execute `OSC 10` with the first color correctly. This fixes some of the issues mentioned in #942 but not all of them. [XParseColor]: https://linux.die.net/man/3/xparsecolor Closes #3715
2020-10-15 02:29:10 +02:00
result = SplitString(L"123", L';');
VERIFY_ARE_EQUAL(1u, result.size());
result = SplitString(L";123", L';');
VERIFY_ARE_EQUAL(2u, result.size());
VERIFY_ARE_EQUAL(L"", result.at(0));
VERIFY_ARE_EQUAL(L"123", result.at(1));
result = SplitString(L"123;", L';');
VERIFY_ARE_EQUAL(2u, result.size());
VERIFY_ARE_EQUAL(L"123", result.at(0));
VERIFY_ARE_EQUAL(L"", result.at(1));
result = SplitString(L"123;456", L';');
VERIFY_ARE_EQUAL(2u, result.size());
VERIFY_ARE_EQUAL(L"123", result.at(0));
VERIFY_ARE_EQUAL(L"456", result.at(1));
result = SplitString(L"123;456;789", L';');
VERIFY_ARE_EQUAL(3u, result.size());
VERIFY_ARE_EQUAL(L"123", result.at(0));
VERIFY_ARE_EQUAL(L"456", result.at(1));
VERIFY_ARE_EQUAL(L"789", result.at(2));
}
Add support for paste filtering and bracketed paste mode (#9034) This adds "paste filtering" & "bracketed paste mode" to the Windows Terminal. I've moved the paste handling code in `TerminalControl` to `Microsoft::Console::Util` to be able to easily test it, and the paste transformer from `TerminalControl` to `TerminalCore`. Supersedes #7508 References #395 (overall bracketed paste support request) Tests added. Manually tested.
2021-02-08 14:11:01 +01:00
void UtilsTests::TestFilterStringForPaste()
{
// Test carriage return
const std::wstring noNewLine = L"Hello World";
VERIFY_ARE_EQUAL(L"Hello World", FilterStringForPaste(noNewLine, FilterOption::CarriageReturnNewline));
const std::wstring singleCR = L"Hello World\r";
VERIFY_ARE_EQUAL(L"Hello World\r", FilterStringForPaste(singleCR, FilterOption::CarriageReturnNewline));
const std::wstring singleLF = L"Hello World\n";
VERIFY_ARE_EQUAL(L"Hello World\r", FilterStringForPaste(singleLF, FilterOption::CarriageReturnNewline));
const std::wstring singleCRLF = L"Hello World\r\n";
VERIFY_ARE_EQUAL(L"Hello World\r", FilterStringForPaste(singleCRLF, FilterOption::CarriageReturnNewline));
const std::wstring multiCR = L"Hello\rWorld\r";
VERIFY_ARE_EQUAL(L"Hello\rWorld\r", FilterStringForPaste(multiCR, FilterOption::CarriageReturnNewline));
const std::wstring multiLF = L"Hello\nWorld\n";
VERIFY_ARE_EQUAL(L"Hello\rWorld\r", FilterStringForPaste(multiLF, FilterOption::CarriageReturnNewline));
const std::wstring multiCRLF = L"Hello\r\nWorld\r\n";
VERIFY_ARE_EQUAL(L"Hello\rWorld\r", FilterStringForPaste(multiCRLF, FilterOption::CarriageReturnNewline));
const std::wstring multiCR_NoNewLine = L"Hello\rWorld\r123";
VERIFY_ARE_EQUAL(L"Hello\rWorld\r123", FilterStringForPaste(multiCR_NoNewLine, FilterOption::CarriageReturnNewline));
const std::wstring multiLF_NoNewLine = L"Hello\nWorld\n123";
VERIFY_ARE_EQUAL(L"Hello\rWorld\r123", FilterStringForPaste(multiLF_NoNewLine, FilterOption::CarriageReturnNewline));
const std::wstring multiCRLF_NoNewLine = L"Hello\r\nWorld\r\n123";
VERIFY_ARE_EQUAL(L"Hello\rWorld\r123", FilterStringForPaste(multiCRLF_NoNewLine, FilterOption::CarriageReturnNewline));
// Test control code filtering
const std::wstring noNewLineWithControlCodes = L"Hello\x01\x02\x03 123";
VERIFY_ARE_EQUAL(L"Hello 123", FilterStringForPaste(noNewLineWithControlCodes, FilterOption::ControlCodes));
const std::wstring singleCRWithControlCodes = L"Hello World\r\x01\x02\x03 123";
VERIFY_ARE_EQUAL(L"Hello World\r 123", FilterStringForPaste(singleCRWithControlCodes, FilterOption::ControlCodes));
const std::wstring singleLFWithControlCodes = L"Hello World\n\x01\x02\x03 123";
VERIFY_ARE_EQUAL(L"Hello World\n 123", FilterStringForPaste(singleLFWithControlCodes, FilterOption::ControlCodes));
const std::wstring singleCRLFWithControlCodes = L"Hello World\r\n\x01\x02\x03 123";
VERIFY_ARE_EQUAL(L"Hello World\r\n 123", FilterStringForPaste(singleCRLFWithControlCodes, FilterOption::ControlCodes));
VERIFY_ARE_EQUAL(L"Hello World\r 123", FilterStringForPaste(singleCRWithControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
VERIFY_ARE_EQUAL(L"Hello World\r 123", FilterStringForPaste(singleLFWithControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
VERIFY_ARE_EQUAL(L"Hello World\r 123", FilterStringForPaste(singleCRLFWithControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
const std::wstring multiCRWithControlCodes = L"Hello\r\x01\x02\x03World\r\x01\x02\x03 123";
VERIFY_ARE_EQUAL(L"Hello\rWorld\r 123", FilterStringForPaste(multiCRWithControlCodes, FilterOption::ControlCodes));
const std::wstring multiLFWithControlCodes = L"Hello\n\x01\x02\x03World\n\x01\x02\x03 123";
VERIFY_ARE_EQUAL(L"Hello\nWorld\n 123", FilterStringForPaste(multiLFWithControlCodes, FilterOption::ControlCodes));
const std::wstring multiCRLFWithControlCodes = L"Hello\r\nWorld\r\n\x01\x02\x03 123";
VERIFY_ARE_EQUAL(L"Hello\r\nWorld\r\n 123", FilterStringForPaste(multiCRLFWithControlCodes, FilterOption::ControlCodes));
VERIFY_ARE_EQUAL(L"Hello\rWorld\r 123", FilterStringForPaste(multiCRWithControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
VERIFY_ARE_EQUAL(L"Hello\rWorld\r 123", FilterStringForPaste(multiLFWithControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
VERIFY_ARE_EQUAL(L"Hello\rWorld\r 123", FilterStringForPaste(multiCRLFWithControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
const std::wstring multiLineWithLotsOfControlCodes = L"e\bc\bh\bo\b \b'.\b!\b:\b\b \bke\bS\b \bi3\bl \bld\bK\bo\b -1\b+\b9 +\b2\b-1'\b >\b \b/\bt\bm\bp\b/\bl\bo\bl\b\r\nsleep 1\r\nmd5sum /tmp/lol";
VERIFY_ARE_EQUAL(L"echo '.!: keS i3l ldKo -1+9 +2-1' > /tmp/lol\rsleep 1\rmd5sum /tmp/lol",
FilterStringForPaste(multiLineWithLotsOfControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
// Malicious string that tries to prematurely terminate bracketed
const std::wstring malicious = L"echo\x1b[201~";
VERIFY_ARE_EQUAL(L"echo[201~", FilterStringForPaste(malicious, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
// C1 control codes
const std::wstring c1ControlCodes = L"echo\x9c";
VERIFY_ARE_EQUAL(L"echo", FilterStringForPaste(c1ControlCodes, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
// Test Unicode content
const std::wstring unicodeString = L"你好\r\n\x01世界\x02\r\n123";
VERIFY_ARE_EQUAL(L"你好\r世界\r123",
FilterStringForPaste(unicodeString, FilterOption::CarriageReturnNewline | FilterOption::ControlCodes));
}
Add support for more OSC color formats (#7578) * Correct the behaviour of parsing `rgb:R/G/B`. It should be interpreted as `RR/GG/BB` instead of `0R/0G/0B` * Add support for `rgb:RRR/GGG/BBB` and `rgb:RRRR/GGGG/BBBB`. The behaviour of 12 bit variants is to repeat the first digit at the end, e.g. `rgb:123/456/789` becomes `rgb:1231/4564/7897`. * Add support for `#` formats. We are following the rules of [XParseColor] by interpreting `#RGB` as `R000G000B000`. * Add support for XOrg app color names, which are supported by xterm, VTE and many other terminal emulators. * Multi-parameter OSC 4 is now supported. * The chaining of OSC 10-12 is not yet supported. But the parameter validation is relaxed by parsing the parameters as multi-params but only use the first one, which means `\e]10;rgb:R/G/B;` and `\e]10:rgb:R/G/B;invalid` will execute `OSC 10` with the first color correctly. This fixes some of the issues mentioned in #942 but not all of them. [XParseColor]: https://linux.die.net/man/3/xparsecolor Closes #3715
2020-10-15 02:29:10 +02:00
void UtilsTests::TestStringToUint()
{
bool success = false;
unsigned int value = 0;
success = StringToUint(L"", value);
VERIFY_IS_FALSE(success);
success = StringToUint(L"xyz", value);
VERIFY_IS_FALSE(success);
success = StringToUint(L";", value);
VERIFY_IS_FALSE(success);
success = StringToUint(L"1", value);
VERIFY_IS_TRUE(success);
VERIFY_ARE_EQUAL(1u, value);
success = StringToUint(L"123", value);
VERIFY_IS_TRUE(success);
VERIFY_ARE_EQUAL(123u, value);
success = StringToUint(L"123456789", value);
VERIFY_IS_TRUE(success);
VERIFY_ARE_EQUAL(123456789u, value);
}
void UtilsTests::TestColorFromXTermColor()
{
_VerifyXTermColorResult(L"rgb:1/1/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rGb:1/1/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"RGB:1/1/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:111/1/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1111/1/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1/11/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1/111/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1/1111/1", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1/1/11", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1/1/111", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1/1/1111", RGB(0x11, 0x11, 0x11));
_VerifyXTermColorResult(L"rgb:1/23/4", RGB(0x11, 0x23, 0x44));
_VerifyXTermColorResult(L"rgb:1/23/45", RGB(0x11, 0x23, 0x45));
_VerifyXTermColorResult(L"rgb:1/23/456", RGB(0x11, 0x23, 0x45));
_VerifyXTermColorResult(L"rgb:12/34/5", RGB(0x12, 0x34, 0x55));
_VerifyXTermColorResult(L"rgb:12/34/56", RGB(0x12, 0x34, 0x56));
_VerifyXTermColorResult(L"rgb:12/345/67", RGB(0x12, 0x34, 0x67));
_VerifyXTermColorResult(L"rgb:12/345/678", RGB(0x12, 0x34, 0x67));
_VerifyXTermColorResult(L"rgb:123/456/789", RGB(0x12, 0x45, 0x78));
_VerifyXTermColorResult(L"rgb:123/4564/789", RGB(0x12, 0x45, 0x78));
_VerifyXTermColorResult(L"rgb:123/4564/7897", RGB(0x12, 0x45, 0x78));
_VerifyXTermColorResult(L"rgb:1231/4564/7897", RGB(0x12, 0x45, 0x78));
_VerifyXTermColorResult(L"#111", RGB(0x10, 0x10, 0x10));
_VerifyXTermColorResult(L"#123456", RGB(0x12, 0x34, 0x56));
_VerifyXTermColorResult(L"#123456789", RGB(0x12, 0x45, 0x78));
_VerifyXTermColorResult(L"#123145647897", RGB(0x12, 0x45, 0x78));
_VerifyXTermColorResult(L"orange", RGB(255, 165, 0));
_VerifyXTermColorResult(L"dark green", RGB(0, 100, 0));
_VerifyXTermColorResult(L"medium sea green", RGB(60, 179, 113));
_VerifyXTermColorResult(L"LightYellow", RGB(255, 255, 224));
Optimize the binary size of the XOrg color table (#7929) This optimizes the binary size of the xorg color table by replacing the static lookup table with a table of variable colors (indexed "" (0) through "4"), calculated greys for gr[ae]y0-100, and a table of the remaining unsuffixed colors. 78 variable colors ... 8 bytes each for pointer+size 5 variants, 4 bytes each for the color data 718 bytes for 0-terminated color names plus 84 colors ... 8 bytes each for pointer+size 4 bytes each for the color data 955 bytes for 8-terminated color names 2902 = (78 * 8) + (78 * 5 * 4) + 718 + 1963 = (84 * 8) + (84 * 4) + 955 ------ 4865 bytes (approximately) "I couldn't sleep at night thinking that after years of accusing Windows being bloated and literally making it even more bloated with my hands. So here you go. The mediocre yet working solution. This reduces the binary size to 1051k (1067k before) while keeping the code maintainable for human beings."
2020-10-16 02:45:33 +02:00
_VerifyXTermColorResult(L"yellow", RGB(255, 255, 0));
_VerifyXTermColorResult(L"yellow3", RGB(205, 205, 0));
_VerifyXTermColorResult(L"wheat", RGB(245, 222, 179));
_VerifyXTermColorResult(L"wheat4", RGB(139, 126, 102));
_VerifyXTermColorResult(L"royalblue", RGB(65, 105, 225));
_VerifyXTermColorResult(L"royalblue3", RGB(58, 95, 205));
_VerifyXTermColorResult(L"gray", RGB(190, 190, 190));
_VerifyXTermColorResult(L"grey", RGB(190, 190, 190));
_VerifyXTermColorResult(L"gray0", RGB(0, 0, 0));
_VerifyXTermColorResult(L"grey0", RGB(0, 0, 0));
_VerifyXTermColorResult(L"gray58", RGB(148, 148, 148));
_VerifyXTermColorResult(L"grey58", RGB(148, 148, 148));
_VerifyXTermColorResult(L"gray99", RGB(252, 252, 252));
_VerifyXTermColorResult(L"grey99", RGB(252, 252, 252));
Add support for more OSC color formats (#7578) * Correct the behaviour of parsing `rgb:R/G/B`. It should be interpreted as `RR/GG/BB` instead of `0R/0G/0B` * Add support for `rgb:RRR/GGG/BBB` and `rgb:RRRR/GGGG/BBBB`. The behaviour of 12 bit variants is to repeat the first digit at the end, e.g. `rgb:123/456/789` becomes `rgb:1231/4564/7897`. * Add support for `#` formats. We are following the rules of [XParseColor] by interpreting `#RGB` as `R000G000B000`. * Add support for XOrg app color names, which are supported by xterm, VTE and many other terminal emulators. * Multi-parameter OSC 4 is now supported. * The chaining of OSC 10-12 is not yet supported. But the parameter validation is relaxed by parsing the parameters as multi-params but only use the first one, which means `\e]10;rgb:R/G/B;` and `\e]10:rgb:R/G/B;invalid` will execute `OSC 10` with the first color correctly. This fixes some of the issues mentioned in #942 but not all of them. [XParseColor]: https://linux.die.net/man/3/xparsecolor Closes #3715
2020-10-15 02:29:10 +02:00
// Invalid sequences.
_VerifyXTermColorInvalid(L"");
_VerifyXTermColorInvalid(L"r:");
_VerifyXTermColorInvalid(L"rg:");
_VerifyXTermColorInvalid(L"rgb:");
_VerifyXTermColorInvalid(L"rgb:/");
_VerifyXTermColorInvalid(L"rgb://");
_VerifyXTermColorInvalid(L"rgb:///");
_VerifyXTermColorInvalid(L"rgb:1");
_VerifyXTermColorInvalid(L"rgb:1/");
_VerifyXTermColorInvalid(L"rgb:/1");
_VerifyXTermColorInvalid(L"rgb:1/1");
_VerifyXTermColorInvalid(L"rgb:1/1/");
_VerifyXTermColorInvalid(L"rgb:1/11/");
_VerifyXTermColorInvalid(L"rgb:/1/1");
_VerifyXTermColorInvalid(L"rgb:1/1/1/");
_VerifyXTermColorInvalid(L"rgb:1/1/1/1");
_VerifyXTermColorInvalid(L"rgb:111111111");
_VerifyXTermColorInvalid(L"rgb:this/is/invalid");
_VerifyXTermColorInvalid(L"rgba:1/1/1");
_VerifyXTermColorInvalid(L"rgbi:1/1/1");
_VerifyXTermColorInvalid(L"cmyk:1/1/1/1");
_VerifyXTermColorInvalid(L"rgb#111");
_VerifyXTermColorInvalid(L"rgb:#111");
_VerifyXTermColorInvalid(L"rgb:rgb:1/1/1");
_VerifyXTermColorInvalid(L"rgb:rgb:#111");
_VerifyXTermColorInvalid(L"#");
_VerifyXTermColorInvalid(L"#1");
_VerifyXTermColorInvalid(L"#1111");
_VerifyXTermColorInvalid(L"#11111");
_VerifyXTermColorInvalid(L"#1/1/1");
_VerifyXTermColorInvalid(L"#11/1/");
_VerifyXTermColorInvalid(L"#1111111");
_VerifyXTermColorInvalid(L"#/1/1/1");
_VerifyXTermColorInvalid(L"#rgb:1/1/1");
_VerifyXTermColorInvalid(L"#111invalid");
_VerifyXTermColorInvalid(L"#invalid111");
_VerifyXTermColorInvalid(L"#1111111111111111");
_VerifyXTermColorInvalid(L"12/34/56");
_VerifyXTermColorInvalid(L"123456");
_VerifyXTermColorInvalid(L"rgb：1/1/1");
_VerifyXTermColorInvalid(L"中文rgb:1/1/1");
_VerifyXTermColorInvalid(L"rgb中文:1/1/1");
_VerifyXTermColorInvalid(L"这是一句中文");
_VerifyXTermColorInvalid(L"RGBİ1/1/1");
_VerifyXTermColorInvalid(L"rgbİ1/1/1");
_VerifyXTermColorInvalid(L"rgbİ:1/1/1");
_VerifyXTermColorInvalid(L"rgß:1/1/1");
_VerifyXTermColorInvalid(L"rgẞ:1/1/1");
Optimize the binary size of the XOrg color table (#7929) This optimizes the binary size of the xorg color table by replacing the static lookup table with a table of variable colors (indexed "" (0) through "4"), calculated greys for gr[ae]y0-100, and a table of the remaining unsuffixed colors. 78 variable colors ... 8 bytes each for pointer+size 5 variants, 4 bytes each for the color data 718 bytes for 0-terminated color names plus 84 colors ... 8 bytes each for pointer+size 4 bytes each for the color data 955 bytes for 8-terminated color names 2902 = (78 * 8) + (78 * 5 * 4) + 718 + 1963 = (84 * 8) + (84 * 4) + 955 ------ 4865 bytes (approximately) "I couldn't sleep at night thinking that after years of accusing Windows being bloated and literally making it even more bloated with my hands. So here you go. The mediocre yet working solution. This reduces the binary size to 1051k (1067k before) while keeping the code maintainable for human beings."
2020-10-16 02:45:33 +02:00
_VerifyXTermColorInvalid(L"yellow8");
_VerifyXTermColorInvalid(L"yellow10");
_VerifyXTermColorInvalid(L"yellow3a");
_VerifyXTermColorInvalid(L"3yellow");
_VerifyXTermColorInvalid(L"royal3blue");
_VerifyXTermColorInvalid(L"5gray");
_VerifyXTermColorInvalid(L"5gray8");
_VerifyXTermColorInvalid(L"58grey");
_VerifyXTermColorInvalid(L"gray-1");
_VerifyXTermColorInvalid(L"gray101");
_VerifyXTermColorInvalid(L"gray-");
_VerifyXTermColorInvalid(L"gray;");
Add support for more OSC color formats (#7578) * Correct the behaviour of parsing `rgb:R/G/B`. It should be interpreted as `RR/GG/BB` instead of `0R/0G/0B` * Add support for `rgb:RRR/GGG/BBB` and `rgb:RRRR/GGGG/BBBB`. The behaviour of 12 bit variants is to repeat the first digit at the end, e.g. `rgb:123/456/789` becomes `rgb:1231/4564/7897`. * Add support for `#` formats. We are following the rules of [XParseColor] by interpreting `#RGB` as `R000G000B000`. * Add support for XOrg app color names, which are supported by xterm, VTE and many other terminal emulators. * Multi-parameter OSC 4 is now supported. * The chaining of OSC 10-12 is not yet supported. But the parameter validation is relaxed by parsing the parameters as multi-params but only use the first one, which means `\e]10;rgb:R/G/B;` and `\e]10:rgb:R/G/B;invalid` will execute `OSC 10` with the first color correctly. This fixes some of the issues mentioned in #942 but not all of them. [XParseColor]: https://linux.die.net/man/3/xparsecolor Closes #3715
2020-10-15 02:29:10 +02:00
}
void UtilsTests::_VerifyXTermColorResult(const std::wstring_view wstr, DWORD colorValue)
{
std::optional<til::color> color = ColorFromXTermColor(wstr);
VERIFY_IS_TRUE(color.has_value());
VERIFY_ARE_EQUAL(colorValue, (COLORREF)color.value());
}
void UtilsTests::_VerifyXTermColorInvalid(const std::wstring_view wstr)
{
std::optional<til::color> color = ColorFromXTermColor(wstr);
VERIFY_IS_FALSE(color.has_value());
}
Reference in a new issue Copy permalink