Skip to content

Commit

Permalink
Start some startup task thoughts
Browse files Browse the repository at this point in the history
  • Loading branch information
@DHowett
DHowett committed Feb 7, 2025
1 parent 8b78be5 commit f0ac7cd
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 1 deletion.
23 changes: 23 additions & 0 deletions src/cascadia/TerminalApp/AppLogic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,32 @@ namespace winrt::TerminalApp::implementation
co_return;
}


const auto tryEnableStartupTask = _settings.GlobalSettings().StartOnUserLogin();
const auto task = co_await StartupTask::GetAsync(StartupTaskName);

auto taskState = task.State();
// If user has not set in json:
// If user has enabled in settings - enable in user settings
// If user has disabled in settings - disable in user settings (can this happen?)
// If user has enabled in json:
// If user has enabled in settings - no change
// If policy has enabled in settings - no change
// If user has disabled in settings - disable in json
// If policy has disabled in settings - disable in json
// If user has disabled in json:
// If user has enabled in settings - enable in json
// If policy has enabled in settings - enable in json
// If user has disabled in settings - no change
// If policy has disabled in settings - no change
//
//... track json state transition
// if user goes from enabled to diabled, try to disable in settings
// if user goes from disabled to enabled, try to enable in settings
// can we detect if RequestEnable succeeded?
std::optional<bool> newFinalStartupTaskState;
std::optional<bool> newFinalUserSettingsValue;

switch (task.State())
{
case StartupTaskState::Disabled:
Expand Down
6 changes: 6 additions & 0 deletions src/cascadia/TerminalSettingsModel/ApplicationState.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,12 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
#undef MTSM_APPLICATION_STATE_GEN

bool ApplicationState::HasLastStartOnUserloginStateSyncedWithOS() const noexcept
{
const auto state = _state.lock_shared();
return state->LastStartOnUserLoginStateSyncedWithOS.has_value();
}

// Method Description:
// - Read the contents of our "shared" state - state that should be shared
// for elevated and unelevated instances. This is things like the list of
Expand Down
5 changes: 4 additions & 1 deletion src/cascadia/TerminalSettingsModel/ApplicationState.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
X(FileSource::Local, Windows::Foundation::Collections::IVector<Model::WindowLayout>, PersistedWindowLayouts, "persistedWindowLayouts") \
X(FileSource::Shared, Windows::Foundation::Collections::IVector<hstring>, RecentCommands, "recentCommands") \
X(FileSource::Shared, Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage>, DismissedMessages, "dismissedMessages") \
X(FileSource::Local, Windows::Foundation::Collections::IVector<hstring>, AllowedCommandlines, "allowedCommandlines")
X(FileSource::Local, Windows::Foundation::Collections::IVector<hstring>, AllowedCommandlines, "allowedCommandlines") \
X(FileSource::Shared, bool, LastStartOnUserLoginStateSyncedWithOS, "lastStartOnUserLoginStateSyncedWithOS")

struct WindowLayout : WindowLayoutT<WindowLayout>
{
Expand Down Expand Up @@ -78,6 +79,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
MTSM_APPLICATION_STATE_FIELDS(MTSM_APPLICATION_STATE_GEN)
#undef MTSM_APPLICATION_STATE_GEN

bool HasLastStartOnUserloginStateSyncedWithOS() const noexcept;

private:
struct state_t
{
Expand Down
3 changes: 3 additions & 0 deletions src/cascadia/TerminalSettingsModel/ApplicationState.idl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,8 @@ namespace Microsoft.Terminal.Settings.Model
Windows.Foundation.Collections.IVector<String> RecentCommands;
Windows.Foundation.Collections.IVector<InfoBarMessage> DismissedMessages;
Windows.Foundation.Collections.IVector<String> AllowedCommandlines;

Boolean LastStartOnUserloginStateSyncedWithOS;
Boolean HasLastStartOnUserloginStateSyncedWithOS();
}
}

1 comment on commit f0ac7cd

@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 (2)

diabled
Userlogin

These words are not needed and should be removed abcd ABCDEFGHIJ abcdefghijk ABCDEFGHIJKLMNOPQRS ABCDEFGHIJKLMNOPQRST ABCDEFGHIJKLMNOPQRSTUVWXY allocs appium Argb asan autocrlf backported bytebuffer cac CLE codenav codepath commandline COMMITID componentization constness dealloc deserializers DISPATCHNOTIFY DTest entrypoints EVENTID FINDUP fuzzer hlocal hstring IInput Interner keyscan Munged numlock offboarded pids positionals Productize pseudoterminal remoting renamer roadmap ruleset SELECTALL somefile Stringable tearoff TODOs touchpad TREX Unregistering USERDATA vectorize viewports wsl

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 [email protected]:microsoft/terminal.git repository
on the dev/duhowett/startup-task-thoughts branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.24/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/13190468988/attempts/1'
Errors (1)

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

❌ Errors Count
❌ ignored-expect-variant 2

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.