a544f56e17
## Summary of the Pull Request This adds a new setting `intenseTextStyle`. It's a per-appearance, control setting, defaulting to `"all"`. * When set to `"all"` or `["bold", "bright"]`, then we'll render text as both **bold** and bright (1.10 behavior) * When set to `"bold"`, `["bold"]`, we'll render text formatted with `^[[1m` as **bold**, but not bright * When set to `"bright"`, `["bright"]`, we'll render text formatted with `^[[1m` as bright, but not bold. This is the pre 1.10 behavior * When set to `"none"`, we won't do anything special for it at all. ## references * I last did this in #10648. This time it's an enum, so we can add bright in the future. It's got positive wording this time. * ~We will want to add `"bright"` as a value in the future, to disable the auto intense->bright conversion.~ I just did that now. * #5682 is related ## PR Checklist * [x] Closes #10576 * [x] I seriously don't think we have an issue for "disable intense is bright", but I'm not crazy, people wanted that, right? https://github.com/microsoft/terminal/issues/2916#issuecomment-544880423 was the closest * [x] I work here * [x] Tests added/passed * [x] https://github.com/MicrosoftDocs/terminal/pull/381 ## Validation Steps Performed <!-- ![image](https://user-images.githubusercontent.com/18356694/125480327-07f6b711-6bca-4c1b-9a76-75fc978c702d.png) --> ![image](https://user-images.githubusercontent.com/18356694/128929228-504933ee-cf50-43a2-9982-55110ba39191.png) Yea that works. Printed some bold text, toggled it on, the text was no longer bold. hooray. ### EDIT, 10 Aug ```json "intenseTextStyle": "none", "intenseTextStyle": "bold", "intenseTextStyle": "bright", "intenseTextStyle": "all", "intenseTextStyle": ["bold", "bright"], ``` all work now. Repro script: ```sh printf "\e[1m[bold]\e[m[normal]\e[34m[blue]\e[1m[bold blue]\e[m\n" ```
56 lines
2.2 KiB
Plaintext
56 lines
2.2 KiB
Plaintext
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
import "Profile.idl";
|
|
#include "IInheritable.idl.h"
|
|
|
|
#define INHERITABLE_APPEARANCE_SETTING(Type, Name) \
|
|
_BASE_INHERITABLE_SETTING(Type, Name); \
|
|
Microsoft.Terminal.Settings.Model.IAppearanceConfig Name##OverrideSource { get; }
|
|
|
|
namespace Microsoft.Terminal.Settings.Model
|
|
{
|
|
[flags] enum ConvergedAlignment {
|
|
// low 4 bits are the horizontal
|
|
Horizontal_Center = 0x00,
|
|
Horizontal_Left = 0x01,
|
|
Horizontal_Right = 0x02,
|
|
|
|
// high 4 bits are the vertical
|
|
Vertical_Center = 0x00,
|
|
Vertical_Top = 0x10,
|
|
Vertical_Bottom = 0x20
|
|
};
|
|
|
|
[flags]
|
|
enum IntenseStyle
|
|
{
|
|
Bold = 0x1,
|
|
Bright = 0x2,
|
|
All = 0xffffffff
|
|
};
|
|
|
|
interface IAppearanceConfig
|
|
{
|
|
Microsoft.Terminal.Settings.Model.Profile SourceProfile { get; };
|
|
INHERITABLE_APPEARANCE_SETTING(String, ColorSchemeName);
|
|
INHERITABLE_APPEARANCE_SETTING(Windows.Foundation.IReference<Microsoft.Terminal.Core.Color>, Foreground);
|
|
INHERITABLE_APPEARANCE_SETTING(Windows.Foundation.IReference<Microsoft.Terminal.Core.Color>, Background);
|
|
INHERITABLE_APPEARANCE_SETTING(Windows.Foundation.IReference<Microsoft.Terminal.Core.Color>, SelectionBackground);
|
|
INHERITABLE_APPEARANCE_SETTING(Windows.Foundation.IReference<Microsoft.Terminal.Core.Color>, CursorColor);
|
|
INHERITABLE_APPEARANCE_SETTING(Microsoft.Terminal.Core.CursorStyle, CursorShape);
|
|
INHERITABLE_APPEARANCE_SETTING(UInt32, CursorHeight);
|
|
|
|
INHERITABLE_APPEARANCE_SETTING(String, BackgroundImagePath);
|
|
String ExpandedBackgroundImagePath { get; };
|
|
|
|
INHERITABLE_APPEARANCE_SETTING(Double, BackgroundImageOpacity);
|
|
INHERITABLE_APPEARANCE_SETTING(Windows.UI.Xaml.Media.Stretch, BackgroundImageStretchMode);
|
|
INHERITABLE_APPEARANCE_SETTING(ConvergedAlignment, BackgroundImageAlignment);
|
|
|
|
INHERITABLE_APPEARANCE_SETTING(Boolean, RetroTerminalEffect);
|
|
INHERITABLE_APPEARANCE_SETTING(String, PixelShaderPath);
|
|
INHERITABLE_APPEARANCE_SETTING(IntenseStyle, IntenseTextStyle);
|
|
};
|
|
}
|