Move colorbrewer into its own proper header (#17444)

I'm planning to use the `dark2` color palette in the upcoming
cooked read rewrite as a debug aid to paint dirty regions.
Now that it's going to be used in more than one place I figured
it may be time to properly add it to the NOTICE file even if
it still won't be shipped with the final product.

.github/actions/spelling/allow/allow.txt

@@ -1,77 +1,40 @@
 aci
-admins
 allcolors
-Apc
-apc
-backpressure
 breadcrumb
 breadcrumbs
-bsd
-calt
 ccmp
 ccon
-changelog
 clickable
-clig
 CMMI
+colorbrewer
 consvc
 copyable
-Counterintuitively
-CtrlDToClose
-CVS
-CUI
-cybersecurity
 dalet
-Dcs
 dcs
 deselection
 dialytika
 diffing
 dje
-downside
 downsides
 dze
 dzhe
-DTo
-EDDB
-EDDC
 Emacspeak
-Enum'd
 Fitt
-formattings
 FTCS
-ftp
-fvar
 gantt
-gcc
-geeksforgeeks
 ghe
-github
 gje
 godbolt
-hostname
-hostnames
-https
-hyperlink
 hyperlinking
 hyperlinks
-iconify
-ID
-img
-inlined
-issuetitle
-It'd
 kje
 libfuzzer
-libuv
 liga
 lje
 Llast
-llvm
 Lmid
 locl
 lol
-lorem
 Lorigin
 maxed
 megathread
@@ -80,28 +43,23 @@ mkmk
 mnt
 mru
 nje
-noreply
 notwrapped
 ogonek
-ok'd
 overlined
 perlw
-pipeline
 postmodern
 Powerline
-powerline
 ptys
 pwshw
-quickfix
 qof
 qps
-Remappings
+quickfix
-Retargets
 rclt
 reimplementation
+Remappings
 reserialization
-reserialize
 reserializes
+Retargets
 rlig
 rubyw
 runtimes
@@ -109,33 +67,18 @@ servicebus
 shcha
 similaritytolerance
 slnt
-Sos
-ssh
-sustainability
 stakeholders
+sustainability
 sxn
-timeline
-timelines
-timestamped
 TLDR
-tokenizes
 tonos
 toolset
-truthiness
 tshe
-ubuntu
 UEFI
 uiatextrange
-UIs
 und
-unregister
-versioned
 vsdevcmd
-walkthrough
-walkthroughs
-We'd
 westus
-wildcards
 workarounds
 XBox
 YBox

.github/actions/spelling/expect/expect.txt

@@ -515,6 +515,7 @@ dsound
 DSSCL
 DSwap
 DTest
+DTo
 DTTERM
 dup'ed
 dvi

NOTICE.md

@@ -325,6 +325,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
+## ColorBrewer
+**Source**: [https://colorbrewer2.org/](https://colorbrewer2.org/)
+
+### License
+
+```
+Apache-Style Software License for ColorBrewer software and ColorBrewer Color Schemes
+
+Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania State University.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+```
+
 # Microsoft Open Source
 
 This product also incorporates source code from other Microsoft open source projects, all licensed under the MIT license.

src/inc/til/colorbrewer.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-namespace Microsoft::Console::Render::Atlas::colorbrewer
+namespace til::colorbrewer
 {
     // The following list of colors is only used as a debug aid and not part of the final product.
     // They're licensed under:
@@ -22,7 +22,7 @@ namespace Microsoft::Console::Render::Atlas::colorbrewer
     //   CONDITIONS OF ANY KIND, either express or implied. See the License for the
     //   specific language governing permissions and limitations under the License.
     //
-    inline constexpr u32 pastel1[]{
+    inline constexpr uint32_t pastel1[]{
         0xfbb4ae,
         0xb3cde3,
         0xccebc5,
@@ -33,4 +33,15 @@ namespace Microsoft::Console::Render::Atlas::colorbrewer
         0xfddaec,
         0xf2f2f2,
     };
+
+    inline constexpr uint32_t dark2[]{
+        0x1b9e77,
+        0xd95f02,
+        0x7570b3,
+        0xe7298a,
+        0x66a61e,
+        0xe6ab02,
+        0xa6761d,
+        0x666666,
+    };
 }

src/renderer/atlas/AtlasEngine.r.cpp

@@ -465,6 +465,7 @@ void AtlasEngine::_present()
         return;
     }
 
+#pragma warning(suppress : 4127) // conditional expression is constant
     if (!ATLAS_DEBUG_SHOW_DIRTY && !_p.s->target->disablePresent1 && memcmp(&dirtyRect, &fullRect, sizeof(RECT)) != 0)
     {
         params.DirtyRectsCount = 1;

src/renderer/atlas/BackendD2D.cpp

@@ -7,7 +7,7 @@
 #include <til/unicode.h>
 
 #if ATLAS_DEBUG_SHOW_DIRTY
-#include "colorbrewer.h"
+#include <til/colorbrewer.h>
 #endif
 
 #if ATLAS_DEBUG_DUMP_RENDER_TARGET
@@ -911,7 +911,7 @@ void BackendD2D::_debugShowDirty(const RenderingPayload& p)
                 static_cast<f32>(rect.right),
                 static_cast<f32>(rect.bottom),
             };
-            const auto color = colorbrewer::pastel1[i] | 0x1f000000;
+            const auto color = til::colorbrewer::pastel1[i] | 0x1f000000;
             _fillRectangle(rectF, color);
         }
     }

src/renderer/atlas/BackendD3D.cpp

@@ -17,7 +17,7 @@
 #include "../../types/inc/ColorFix.hpp"
 
 #if ATLAS_DEBUG_SHOW_DIRTY || ATLAS_DEBUG_COLORIZE_GLYPH_ATLAS
-#include "colorbrewer.h"
+#include <til/colorbrewer.h>
 #endif
 
 TIL_FAST_MATH_BEGIN
@@ -2222,7 +2222,7 @@ void BackendD3D::_debugShowDirty(const RenderingPayload& p)
         if (rect.non_empty())
         {
             _appendQuad() = {
-                .shadingType = ShadingType::Selection,
+                .shadingType = static_cast<u16>(ShadingType::Selection),
                 .position = {
                     static_cast<i16>(rect.left),
                     static_cast<i16>(rect.top),
@@ -2231,7 +2231,7 @@ void BackendD3D::_debugShowDirty(const RenderingPayload& p)
                     static_cast<u16>(rect.right - rect.left),
                     static_cast<u16>(rect.bottom - rect.top),
                 },
-                .color = colorbrewer::pastel1[i] | 0x1f000000,
+                .color = til::colorbrewer::pastel1[i] | 0x1f000000,
             };
         }
     }

src/renderer/atlas/atlas.vcxproj

@@ -32,7 +32,6 @@
     <ClInclude Include="BackendD2D.h" />
     <ClInclude Include="BackendD3D.h" />
     <ClInclude Include="BuiltinGlyphs.h" />
-    <ClInclude Include="colorbrewer.h" />
     <ClInclude Include="common.h" />
     <ClInclude Include="dwrite.h" />
     <ClInclude Include="DWriteTextAnalysis.h" />
@@ -102,4 +101,4 @@
       <AdditionalIncludeDirectories>$(SolutionDir)\oss\stb;$(OutDir)$(ProjectName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
-</Project>
+</Project>