Skip to content

Commit 9703212

Browse files
zadjii-msftzadjii-msft
committed
Merge remote-tracking branch 'origin/master' into dev/migrie/f/288-launchMode-fullscreen
2 parents f1f4e44 + 99a6fa4 commit 9703212

File tree

3 files changed

+142
-144
lines changed

3 files changed

+142
-144
lines changed

‎.github/actions/spell-check/whitelist/whitelist.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ CARETBLINKINGENABLED
224224
CARRIAGERETURN
225225
cascadia
226226
catid
227+
carlos
228+
zamora
227229
cazamor
228230
CBash
229231
cbb

‎README.md‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
This repository contains the source code for:
44

5-
* [Windows Terminal](https://www.microsoft.com/en-us/p/windows-terminal-preview/9n0dx20hk701)
5+
* [Windows Terminal](https://aka.ms/terminal)
6+
* [Windows Terminal Preview](https://aka.ms/terminal-preview)
67
* The Windows console host (`conhost.exe`)
78
* Components shared between the two projects
89
* [ColorTool](https://github.com/Microsoft/Terminal/tree/master/src/tools/ColorTool)
910
* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples) that show how to consume the Windows Console APIs
1011

1112
Related repositories include:
1213

14+
* [Windows Terminal Documentation](https://github.com/MicrosoftDocs/terminal)
1315
* [Console API Documentation](https://github.com/MicrosoftDocs/Console-Docs)
1416
* [Cascadia Code Font](https://github.com/Microsoft/Cascadia-Code)
1517

@@ -19,7 +21,7 @@ Related repositories include:
1921
2022
### Microsoft Store [Recommended]
2123

22-
Install the [Windows Terminal from the Microsoft Store][store-install-link]. This allows you to always be on the latest version when we release new builds with automatic upgrades.
24+
Install the [Windows Terminal from the Microsoft Store][store-install-link]. This allows you to always be on the latest version when we release new builds with automatic upgrades.
2325

2426
This is our preferred method.
2527

@@ -61,12 +63,6 @@ ColorTool|![](https://microsoft.visualstudio.com/_apis/public/build/definitions/
6163

6264
---
6365

64-
## Windows Terminal v1.0 Roadmap
65-
66-
The plan for delivering Windows Terminal v1.0 [is described here](/doc/terminal-v1-roadmap.md), and will be updated as the project proceeds.
67-
68-
---
69-
7066
## Terminal & Console Overview
7167

7268
Please take a few minutes to review the overview below before diving into the code:
@@ -131,7 +127,7 @@ Solution: Make sure you're building & deploying the `CascadiaPackage` project in
131127

132128
## Documentation
133129

134-
All project documentation is located in the `./doc` folder. If you would like to contribute to the documentation, please submit a pull request.
130+
All project documentation is located at aka.ms/terminal-docs. If you would like to contribute to the documentation, please submit a pull request on the [Windows Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
135131

136132
---
137133

@@ -226,4 +222,4 @@ For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [open
226222
[conduct-code]: https://opensource.microsoft.com/codeofconduct/
227223
[conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
228224
[conduct-email]: mailto:opencode@microsoft.com
229-
[store-install-link]: https://aka.ms/windowsterminal
225+
[store-install-link]: https://aka.ms/terminal

‎src/types/utils.cpp‎

Lines changed: 134 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,22 @@ void Utils::InitializeCampbellColorTable(const gsl::span<COLORREF> table)
122122
THROW_HR_IF(E_INVALIDARG, table.size() < 16);
123123

124124
// clang-format off
125-
table[0] = RGB( 12, 12, 12);
126-
table[1] = RGB( 197, 15, 31);
127-
table[2] = RGB( 19, 161, 14);
128-
table[3] = RGB( 193, 156, 0);
129-
table[4] = RGB( 0, 55, 218);
130-
table[5] = RGB( 136, 23, 152);
131-
table[6] = RGB( 58, 150, 221);
132-
table[7] = RGB( 204, 204, 204);
133-
table[8] = RGB( 118, 118, 118);
134-
table[9] = RGB( 231, 72, 86);
135-
table[10] = RGB( 22, 198, 12);
136-
table[11] = RGB( 249, 241, 165);
137-
table[12] = RGB( 59, 120, 255);
138-
table[13] = RGB( 180, 0, 158);
139-
table[14] = RGB( 97, 214, 214);
140-
table[15] = RGB( 242, 242, 242);
125+
table[0] = RGB(12, 12, 12);
126+
table[1] = RGB(197, 15, 31);
127+
table[2] = RGB(19, 161, 14);
128+
table[3] = RGB(193, 156, 0);
129+
table[4] = RGB(0, 55, 218);
130+
table[5] = RGB(136, 23, 152);
131+
table[6] = RGB(58, 150, 221);
132+
table[7] = RGB(204, 204, 204);
133+
table[8] = RGB(118, 118, 118);
134+
table[9] = RGB(231, 72, 86);
135+
table[10] = RGB(22, 198, 12);
136+
table[11] = RGB(249, 241, 165);
137+
table[12] = RGB(59, 120, 255);
138+
table[13] = RGB(180, 0, 158);
139+
table[14] = RGB(97, 214, 214);
140+
table[15] = RGB(242, 242, 242);
141141
// clang-format on
142142
}
143143

@@ -182,106 +182,106 @@ void Utils::Initialize256ColorTable(const gsl::span<COLORREF> table)
182182
THROW_HR_IF(E_INVALIDARG, table.size() < 256);
183183

184184
// clang-format off
185-
table[0] = RGB( 0x00, 0x00, 0x00);
186-
table[1] = RGB( 0x80, 0x00, 0x00);
187-
table[2] = RGB( 0x00, 0x80, 0x00);
188-
table[3] = RGB( 0x80, 0x80, 0x00);
189-
table[4] = RGB( 0x00, 0x00, 0x80);
190-
table[5] = RGB( 0x80, 0x00, 0x80);
191-
table[6] = RGB( 0x00, 0x80, 0x80);
192-
table[7] = RGB( 0xc0, 0xc0, 0xc0);
193-
table[8] = RGB( 0x80, 0x80, 0x80);
194-
table[9] = RGB( 0xff, 0x00, 0x00);
195-
table[10] = RGB( 0x00, 0xff, 0x00);
196-
table[11] = RGB( 0xff, 0xff, 0x00);
197-
table[12] = RGB( 0x00, 0x00, 0xff);
198-
table[13] = RGB( 0xff, 0x00, 0xff);
199-
table[14] = RGB( 0x00, 0xff, 0xff);
200-
table[15] = RGB( 0xff, 0xff, 0xff);
201-
table[16] = RGB( 0x00, 0x00, 0x00);
202-
table[17] = RGB( 0x00, 0x00, 0x5f);
203-
table[18] = RGB( 0x00, 0x00, 0x87);
204-
table[19] = RGB( 0x00, 0x00, 0xaf);
205-
table[20] = RGB( 0x00, 0x00, 0xd7);
206-
table[21] = RGB( 0x00, 0x00, 0xff);
207-
table[22] = RGB( 0x00, 0x5f, 0x00);
208-
table[23] = RGB( 0x00, 0x5f, 0x5f);
209-
table[24] = RGB( 0x00, 0x5f, 0x87);
210-
table[25] = RGB( 0x00, 0x5f, 0xaf);
211-
table[26] = RGB( 0x00, 0x5f, 0xd7);
212-
table[27] = RGB( 0x00, 0x5f, 0xff);
213-
table[28] = RGB( 0x00, 0x87, 0x00);
214-
table[29] = RGB( 0x00, 0x87, 0x5f);
215-
table[30] = RGB( 0x00, 0x87, 0x87);
216-
table[31] = RGB( 0x00, 0x87, 0xaf);
217-
table[32] = RGB( 0x00, 0x87, 0xd7);
218-
table[33] = RGB( 0x00, 0x87, 0xff);
219-
table[34] = RGB( 0x00, 0xaf, 0x00);
220-
table[35] = RGB( 0x00, 0xaf, 0x5f);
221-
table[36] = RGB( 0x00, 0xaf, 0x87);
222-
table[37] = RGB( 0x00, 0xaf, 0xaf);
223-
table[38] = RGB( 0x00, 0xaf, 0xd7);
224-
table[39] = RGB( 0x00, 0xaf, 0xff);
225-
table[40] = RGB( 0x00, 0xd7, 0x00);
226-
table[41] = RGB( 0x00, 0xd7, 0x5f);
227-
table[42] = RGB( 0x00, 0xd7, 0x87);
228-
table[43] = RGB( 0x00, 0xd7, 0xaf);
229-
table[44] = RGB( 0x00, 0xd7, 0xd7);
230-
table[45] = RGB( 0x00, 0xd7, 0xff);
231-
table[46] = RGB( 0x00, 0xff, 0x00);
232-
table[47] = RGB( 0x00, 0xff, 0x5f);
233-
table[48] = RGB( 0x00, 0xff, 0x87);
234-
table[49] = RGB( 0x00, 0xff, 0xaf);
235-
table[50] = RGB( 0x00, 0xff, 0xd7);
236-
table[51] = RGB( 0x00, 0xff, 0xff);
237-
table[52] = RGB( 0x5f, 0x00, 0x00);
238-
table[53] = RGB( 0x5f, 0x00, 0x5f);
239-
table[54] = RGB( 0x5f, 0x00, 0x87);
240-
table[55] = RGB( 0x5f, 0x00, 0xaf);
241-
table[56] = RGB( 0x5f, 0x00, 0xd7);
242-
table[57] = RGB( 0x5f, 0x00, 0xff);
243-
table[58] = RGB( 0x5f, 0x5f, 0x00);
244-
table[59] = RGB( 0x5f, 0x5f, 0x5f);
245-
table[60] = RGB( 0x5f, 0x5f, 0x87);
246-
table[61] = RGB( 0x5f, 0x5f, 0xaf);
247-
table[62] = RGB( 0x5f, 0x5f, 0xd7);
248-
table[63] = RGB( 0x5f, 0x5f, 0xff);
249-
table[64] = RGB( 0x5f, 0x87, 0x00);
250-
table[65] = RGB( 0x5f, 0x87, 0x5f);
251-
table[66] = RGB( 0x5f, 0x87, 0x87);
252-
table[67] = RGB( 0x5f, 0x87, 0xaf);
253-
table[68] = RGB( 0x5f, 0x87, 0xd7);
254-
table[69] = RGB( 0x5f, 0x87, 0xff);
255-
table[70] = RGB( 0x5f, 0xaf, 0x00);
256-
table[71] = RGB( 0x5f, 0xaf, 0x5f);
257-
table[72] = RGB( 0x5f, 0xaf, 0x87);
258-
table[73] = RGB( 0x5f, 0xaf, 0xaf);
259-
table[74] = RGB( 0x5f, 0xaf, 0xd7);
260-
table[75] = RGB( 0x5f, 0xaf, 0xff);
261-
table[76] = RGB( 0x5f, 0xd7, 0x00);
262-
table[77] = RGB( 0x5f, 0xd7, 0x5f);
263-
table[78] = RGB( 0x5f, 0xd7, 0x87);
264-
table[79] = RGB( 0x5f, 0xd7, 0xaf);
265-
table[80] = RGB( 0x5f, 0xd7, 0xd7);
266-
table[81] = RGB( 0x5f, 0xd7, 0xff);
267-
table[82] = RGB( 0x5f, 0xff, 0x00);
268-
table[83] = RGB( 0x5f, 0xff, 0x5f);
269-
table[84] = RGB( 0x5f, 0xff, 0x87);
270-
table[85] = RGB( 0x5f, 0xff, 0xaf);
271-
table[86] = RGB( 0x5f, 0xff, 0xd7);
272-
table[87] = RGB( 0x5f, 0xff, 0xff);
273-
table[88] = RGB( 0x87, 0x00, 0x00);
274-
table[89] = RGB( 0x87, 0x00, 0x5f);
275-
table[90] = RGB( 0x87, 0x00, 0x87);
276-
table[91] = RGB( 0x87, 0x00, 0xaf);
277-
table[92] = RGB( 0x87, 0x00, 0xd7);
278-
table[93] = RGB( 0x87, 0x00, 0xff);
279-
table[94] = RGB( 0x87, 0x5f, 0x00);
280-
table[95] = RGB( 0x87, 0x5f, 0x5f);
281-
table[96] = RGB( 0x87, 0x5f, 0x87);
282-
table[97] = RGB( 0x87, 0x5f, 0xaf);
283-
table[98] = RGB( 0x87, 0x5f, 0xd7);
284-
table[99] = RGB( 0x87, 0x5f, 0xff);
185+
table[0] = RGB(0x00, 0x00, 0x00);
186+
table[1] = RGB(0x80, 0x00, 0x00);
187+
table[2] = RGB(0x00, 0x80, 0x00);
188+
table[3] = RGB(0x80, 0x80, 0x00);
189+
table[4] = RGB(0x00, 0x00, 0x80);
190+
table[5] = RGB(0x80, 0x00, 0x80);
191+
table[6] = RGB(0x00, 0x80, 0x80);
192+
table[7] = RGB(0xc0, 0xc0, 0xc0);
193+
table[8] = RGB(0x80, 0x80, 0x80);
194+
table[9] = RGB(0xff, 0x00, 0x00);
195+
table[10] = RGB(0x00, 0xff, 0x00);
196+
table[11] = RGB(0xff, 0xff, 0x00);
197+
table[12] = RGB(0x00, 0x00, 0xff);
198+
table[13] = RGB(0xff, 0x00, 0xff);
199+
table[14] = RGB(0x00, 0xff, 0xff);
200+
table[15] = RGB(0xff, 0xff, 0xff);
201+
table[16] = RGB(0x00, 0x00, 0x00);
202+
table[17] = RGB(0x00, 0x00, 0x5f);
203+
table[18] = RGB(0x00, 0x00, 0x87);
204+
table[19] = RGB(0x00, 0x00, 0xaf);
205+
table[20] = RGB(0x00, 0x00, 0xd7);
206+
table[21] = RGB(0x00, 0x00, 0xff);
207+
table[22] = RGB(0x00, 0x5f, 0x00);
208+
table[23] = RGB(0x00, 0x5f, 0x5f);
209+
table[24] = RGB(0x00, 0x5f, 0x87);
210+
table[25] = RGB(0x00, 0x5f, 0xaf);
211+
table[26] = RGB(0x00, 0x5f, 0xd7);
212+
table[27] = RGB(0x00, 0x5f, 0xff);
213+
table[28] = RGB(0x00, 0x87, 0x00);
214+
table[29] = RGB(0x00, 0x87, 0x5f);
215+
table[30] = RGB(0x00, 0x87, 0x87);
216+
table[31] = RGB(0x00, 0x87, 0xaf);
217+
table[32] = RGB(0x00, 0x87, 0xd7);
218+
table[33] = RGB(0x00, 0x87, 0xff);
219+
table[34] = RGB(0x00, 0xaf, 0x00);
220+
table[35] = RGB(0x00, 0xaf, 0x5f);
221+
table[36] = RGB(0x00, 0xaf, 0x87);
222+
table[37] = RGB(0x00, 0xaf, 0xaf);
223+
table[38] = RGB(0x00, 0xaf, 0xd7);
224+
table[39] = RGB(0x00, 0xaf, 0xff);
225+
table[40] = RGB(0x00, 0xd7, 0x00);
226+
table[41] = RGB(0x00, 0xd7, 0x5f);
227+
table[42] = RGB(0x00, 0xd7, 0x87);
228+
table[43] = RGB(0x00, 0xd7, 0xaf);
229+
table[44] = RGB(0x00, 0xd7, 0xd7);
230+
table[45] = RGB(0x00, 0xd7, 0xff);
231+
table[46] = RGB(0x00, 0xff, 0x00);
232+
table[47] = RGB(0x00, 0xff, 0x5f);
233+
table[48] = RGB(0x00, 0xff, 0x87);
234+
table[49] = RGB(0x00, 0xff, 0xaf);
235+
table[50] = RGB(0x00, 0xff, 0xd7);
236+
table[51] = RGB(0x00, 0xff, 0xff);
237+
table[52] = RGB(0x5f, 0x00, 0x00);
238+
table[53] = RGB(0x5f, 0x00, 0x5f);
239+
table[54] = RGB(0x5f, 0x00, 0x87);
240+
table[55] = RGB(0x5f, 0x00, 0xaf);
241+
table[56] = RGB(0x5f, 0x00, 0xd7);
242+
table[57] = RGB(0x5f, 0x00, 0xff);
243+
table[58] = RGB(0x5f, 0x5f, 0x00);
244+
table[59] = RGB(0x5f, 0x5f, 0x5f);
245+
table[60] = RGB(0x5f, 0x5f, 0x87);
246+
table[61] = RGB(0x5f, 0x5f, 0xaf);
247+
table[62] = RGB(0x5f, 0x5f, 0xd7);
248+
table[63] = RGB(0x5f, 0x5f, 0xff);
249+
table[64] = RGB(0x5f, 0x87, 0x00);
250+
table[65] = RGB(0x5f, 0x87, 0x5f);
251+
table[66] = RGB(0x5f, 0x87, 0x87);
252+
table[67] = RGB(0x5f, 0x87, 0xaf);
253+
table[68] = RGB(0x5f, 0x87, 0xd7);
254+
table[69] = RGB(0x5f, 0x87, 0xff);
255+
table[70] = RGB(0x5f, 0xaf, 0x00);
256+
table[71] = RGB(0x5f, 0xaf, 0x5f);
257+
table[72] = RGB(0x5f, 0xaf, 0x87);
258+
table[73] = RGB(0x5f, 0xaf, 0xaf);
259+
table[74] = RGB(0x5f, 0xaf, 0xd7);
260+
table[75] = RGB(0x5f, 0xaf, 0xff);
261+
table[76] = RGB(0x5f, 0xd7, 0x00);
262+
table[77] = RGB(0x5f, 0xd7, 0x5f);
263+
table[78] = RGB(0x5f, 0xd7, 0x87);
264+
table[79] = RGB(0x5f, 0xd7, 0xaf);
265+
table[80] = RGB(0x5f, 0xd7, 0xd7);
266+
table[81] = RGB(0x5f, 0xd7, 0xff);
267+
table[82] = RGB(0x5f, 0xff, 0x00);
268+
table[83] = RGB(0x5f, 0xff, 0x5f);
269+
table[84] = RGB(0x5f, 0xff, 0x87);
270+
table[85] = RGB(0x5f, 0xff, 0xaf);
271+
table[86] = RGB(0x5f, 0xff, 0xd7);
272+
table[87] = RGB(0x5f, 0xff, 0xff);
273+
table[88] = RGB(0x87, 0x00, 0x00);
274+
table[89] = RGB(0x87, 0x00, 0x5f);
275+
table[90] = RGB(0x87, 0x00, 0x87);
276+
table[91] = RGB(0x87, 0x00, 0xaf);
277+
table[92] = RGB(0x87, 0x00, 0xd7);
278+
table[93] = RGB(0x87, 0x00, 0xff);
279+
table[94] = RGB(0x87, 0x5f, 0x00);
280+
table[95] = RGB(0x87, 0x5f, 0x5f);
281+
table[96] = RGB(0x87, 0x5f, 0x87);
282+
table[97] = RGB(0x87, 0x5f, 0xaf);
283+
table[98] = RGB(0x87, 0x5f, 0xd7);
284+
table[99] = RGB(0x87, 0x5f, 0xff);
285285
table[100] = RGB(0x87, 0x87, 0x00);
286286
table[101] = RGB(0x87, 0x87, 0x5f);
287287
table[102] = RGB(0x87, 0x87, 0x87);
@@ -360,24 +360,24 @@ void Utils::Initialize256ColorTable(const gsl::span<COLORREF> table)
360360
table[175] = RGB(0xd7, 0x87, 0xaf);
361361
table[176] = RGB(0xd7, 0x87, 0xd7);
362362
table[177] = RGB(0xd7, 0x87, 0xff);
363-
table[178] = RGB(0xdf, 0xaf, 0x00);
364-
table[179] = RGB(0xdf, 0xaf, 0x5f);
365-
table[180] = RGB(0xdf, 0xaf, 0x87);
366-
table[181] = RGB(0xdf, 0xaf, 0xaf);
367-
table[182] = RGB(0xdf, 0xaf, 0xd7);
368-
table[183] = RGB(0xdf, 0xaf, 0xff);
369-
table[184] = RGB(0xdf, 0xd7, 0x00);
370-
table[185] = RGB(0xdf, 0xd7, 0x5f);
371-
table[186] = RGB(0xdf, 0xd7, 0x87);
372-
table[187] = RGB(0xdf, 0xd7, 0xaf);
373-
table[188] = RGB(0xdf, 0xd7, 0xd7);
374-
table[189] = RGB(0xdf, 0xd7, 0xff);
375-
table[190] = RGB(0xdf, 0xff, 0x00);
376-
table[191] = RGB(0xdf, 0xff, 0x5f);
377-
table[192] = RGB(0xdf, 0xff, 0x87);
378-
table[193] = RGB(0xdf, 0xff, 0xaf);
379-
table[194] = RGB(0xdf, 0xff, 0xd7);
380-
table[195] = RGB(0xdf, 0xff, 0xff);
363+
table[178] = RGB(0xd7, 0xaf, 0x00);
364+
table[179] = RGB(0xd7, 0xaf, 0x5f);
365+
table[180] = RGB(0xd7, 0xaf, 0x87);
366+
table[181] = RGB(0xd7, 0xaf, 0xaf);
367+
table[182] = RGB(0xd7, 0xaf, 0xd7);
368+
table[183] = RGB(0xd7, 0xaf, 0xff);
369+
table[184] = RGB(0xd7, 0xd7, 0x00);
370+
table[185] = RGB(0xd7, 0xd7, 0x5f);
371+
table[186] = RGB(0xd7, 0xd7, 0x87);
372+
table[187] = RGB(0xd7, 0xd7, 0xaf);
373+
table[188] = RGB(0xd7, 0xd7, 0xd7);
374+
table[189] = RGB(0xd7, 0xd7, 0xff);
375+
table[190] = RGB(0xd7, 0xff, 0x00);
376+
table[191] = RGB(0xd7, 0xff, 0x5f);
377+
table[192] = RGB(0xd7, 0xff, 0x87);
378+
table[193] = RGB(0xd7, 0xff, 0xaf);
379+
table[194] = RGB(0xd7, 0xff, 0xd7);
380+
table[195] = RGB(0xd7, 0xff, 0xff);
381381
table[196] = RGB(0xff, 0x00, 0x00);
382382
table[197] = RGB(0xff, 0x00, 0x5f);
383383
table[198] = RGB(0xff, 0x00, 0x87);

0 commit comments

Comments
 (0)
⚡