Skip to content

Commit

Permalink
Make ColorFromXOrgAppColorName both smaller and faster
Browse files Browse the repository at this point in the history
We don't need to use `stringstream` to generate a ten-character string,
and we for _sure_ don't need to use the locale-aware ctype functions
after we just wrote a comment saying "XOrg colors are always Latin-1"

| Size Diff | Object         | Library  |
| --------- | -------------- | -------- |
| -11.8 KB  | colorTable.obj | ConTypes |
  • Loading branch information
DHowett committed Mar 5, 2024
1 parent 338c504 commit cd7cf09
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
File renamed without changes.
13 changes: 6 additions & 7 deletions src/types/colorTable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ void Utils::InitializeColorTable(const std::span<COLORREF> table)
std::optional<til::color> Utils::ColorFromXOrgAppColorName(const std::wstring_view wstr) noexcept
try
{
std::stringstream ss;
std::string stem;
size_t variantIndex = 0;
auto foundVariant = false;
for (const auto c : wstr)
Expand All @@ -485,7 +485,7 @@ try
}

// Ignore spaces.
if (std::iswspace(c))
if (c == L' ' || c == L'\f' || c == L'\n' || c == L'\r' || c == L'\t' || c == L'\v')
{
continue;
}
Expand All @@ -498,11 +498,10 @@ try
return std::nullopt;
}

ss << gsl::narrow_cast<char>(std::towlower(c));
stem += gsl::narrow_cast<char>(til::tolower_ascii(c));
}

auto name = ss.str();
const auto variantColorIter = xorgAppVariantColorTable.find(name);
const auto variantColorIter = xorgAppVariantColorTable.find(stem);
if (variantColorIter != xorgAppVariantColorTable.end())
{
const auto colors = variantColorIter->second;
Expand All @@ -513,7 +512,7 @@ try
}

// Calculate the color value for gray0 - gray99.
if ((name == "gray" || name == "grey") && foundVariant)
if ((stem == "gray" || stem == "grey") && foundVariant)
{
if (variantIndex > 100) // size_t is unsigned, so >=0 is implicit
{
Expand All @@ -523,7 +522,7 @@ try
return til::color{ component, component, component };
}

const auto colorIter = xorgAppColorTable.find(name);
const auto colorIter = xorgAppColorTable.find(stem);
if (colorIter != xorgAppColorTable.end())
{
return colorIter->second;
Expand Down

1 comment on commit cd7cf09

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log or 📝 job summary for details.

Unrecognized words (1)

Sourcelink

Previously acknowledged words that are now absent AAAa Batang chcbpat CLUSTERMAP COLORMATRIX COLR DBlob dcompile DESTINATIONNAME dxguid FFrom GFEh inputrc kcub kcud kcuf kcuu khome Mbxy Mip QUESTIONMARK reallocs reamapping Resequence RTFTo srv subresource tracelog TRIANGLESTRIP Uniscribe waitable WScript XColors xff XMFLOAT 🫥
To accept these unrecognized words as correct and remove the previously acknowledged and now absent words, you could run the following commands

... in a clone of the git@github.com:microsoft/terminal.git repository
on the dev/duhowett/colortable branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.22/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/8162658902/attempts/1'
Available 📚 dictionaries could cover words (expected and unrecognized) not in the 📘 dictionary

This includes both expected items (2256) from .github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt
.github/actions/spelling/expect/alphabet.txt
.github/actions/spelling/expect/expect.txt
.github/actions/spelling/expect/web.txt and unrecognized words (1)

Dictionary Entries Covers Uniquely
cspell:swift/src/swift.txt 53 1 1
cspell:gaming-terms/dict/gaming-terms.txt 59 1 1
cspell:monkeyc/src/monkeyc_keywords.txt 123 1 1
cspell:cryptocurrencies/cryptocurrencies.txt 125 1 1
cspell:scala/dict/scala.txt 153 1 1

Consider adding them (in .github/workflows/spelling2.yml) for uses: check-spelling/check-spelling@v0.0.22 in its with:

      with:
        extra_dictionaries:
          cspell:swift/src/swift.txt
          cspell:gaming-terms/dict/gaming-terms.txt
          cspell:monkeyc/src/monkeyc_keywords.txt
          cspell:cryptocurrencies/cryptocurrencies.txt
          cspell:scala/dict/scala.txt

To stop checking additional dictionaries, add (in .github/workflows/spelling2.yml) for uses: check-spelling/check-spelling@v0.0.22 in its with:

check_extra_dictionaries: ''
Errors (2)

See the 📜action log or 📝 job summary for details.

❌ Errors Count
❌ check-file-path 1
❌ ignored-expect-variant 4

See ❌ Event descriptions for more information.

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.