mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 02:36:19 +02:00
CmdPal: Add history to the new run page (#40427)
_⚠️ targets #39955_
This adds history support to the new run page.
* It'll initialize the history with the history from the run dialog, if
there is any.
* Any new commands that are run, or files/dirs that are opened will also
get added to the history
* history will persist across reboots
This commit is contained in:
@@ -383,4 +383,5 @@ namespace winrt::Microsoft::Terminal::UI::implementation
|
||||
icon.Height(targetSize);
|
||||
return icon;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ namespace winrt::Microsoft::Terminal::UI::implementation
|
||||
static Microsoft::UI::Xaml::Controls::IconSource IconSourceMUX(const winrt::hstring& iconPath, bool convertToGrayscale, const int targetSize=24);
|
||||
static Microsoft::UI::Xaml::Controls::IconElement IconMUX(const winrt::hstring& iconPath);
|
||||
static Microsoft::UI::Xaml::Controls::IconElement IconMUX(const winrt::hstring& iconPath, const int targetSize);
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -153,6 +153,9 @@
|
||||
<ClInclude Include="IconPathConverter.h">
|
||||
<DependentUpon>IconPathConverter.idl</DependentUpon>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RunHistory.h">
|
||||
<DependentUpon>RunHistory.idl</DependentUpon>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ResourceString.h">
|
||||
<DependentUpon>ResourceString.idl</DependentUpon>
|
||||
</ClInclude>
|
||||
@@ -168,6 +171,9 @@
|
||||
<ClCompile Include="IconPathConverter.cpp">
|
||||
<DependentUpon>IconPathConverter.idl</DependentUpon>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RunHistory.cpp">
|
||||
<DependentUpon>RunHistory.idl</DependentUpon>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ResourceString.cpp">
|
||||
<DependentUpon>ResourceString.idl</DependentUpon>
|
||||
</ClCompile>
|
||||
@@ -176,6 +182,7 @@
|
||||
<ItemGroup>
|
||||
<Midl Include="Converters.idl" />
|
||||
<Midl Include="IconPathConverter.idl" />
|
||||
<Midl Include="RunHistory.idl" />
|
||||
<Midl Include="IDirectKeyListener.idl" />
|
||||
<Midl Include="ResourceString.idl" />
|
||||
</ItemGroup>
|
||||
|
||||
87
src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.cpp
Normal file
87
src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.cpp
Normal file
@@ -0,0 +1,87 @@
|
||||
#include "pch.h"
|
||||
#include "RunHistory.h"
|
||||
#include "RunHistory.g.cpp"
|
||||
|
||||
|
||||
using namespace winrt::Windows;
|
||||
|
||||
namespace winrt::Microsoft::Terminal::UI::implementation
|
||||
{
|
||||
// Run history
|
||||
// Largely copied from the Run work circa 2022.
|
||||
|
||||
winrt::Windows::Foundation::Collections::IVector<hstring> RunHistory::CreateRunHistory()
|
||||
{
|
||||
// Load MRU history
|
||||
std::vector<hstring> history;
|
||||
|
||||
wil::unique_hmodule _comctl;
|
||||
HANDLE(WINAPI* _createMRUList)(MRUINFO* lpmi);
|
||||
int(WINAPI* _enumMRUList)(HANDLE hMRU,int nItem,void* lpData,UINT uLen);
|
||||
void(WINAPI *_freeMRUList)(HANDLE hMRU);
|
||||
int(WINAPI *_addMRUString)(HANDLE hMRU, LPCWSTR szString);
|
||||
|
||||
// Lazy load comctl32.dll
|
||||
// Theoretically, we could cache this into a magic static, but we shouldn't need to actually do this more than once in CmdPal
|
||||
_comctl.reset(LoadLibraryExW(L"comctl32.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32));
|
||||
|
||||
_createMRUList = reinterpret_cast<decltype(_createMRUList)>(GetProcAddress(_comctl.get(), "CreateMRUListW"));
|
||||
FAIL_FAST_LAST_ERROR_IF(!_createMRUList);
|
||||
|
||||
_enumMRUList = reinterpret_cast<decltype(_enumMRUList)>(GetProcAddress(_comctl.get(), "EnumMRUListW"));
|
||||
FAIL_FAST_LAST_ERROR_IF(!_enumMRUList);
|
||||
|
||||
_freeMRUList = reinterpret_cast<decltype(_freeMRUList)>(GetProcAddress(_comctl.get(), "FreeMRUList"));
|
||||
FAIL_FAST_LAST_ERROR_IF(!_freeMRUList);
|
||||
|
||||
_addMRUString = reinterpret_cast<decltype(_addMRUString)>(GetProcAddress(_comctl.get(), "AddMRUStringW"));
|
||||
FAIL_FAST_LAST_ERROR_IF(!_addMRUString);
|
||||
|
||||
static const WCHAR c_szRunMRU[] = REGSTR_PATH_EXPLORER L"\\RunMRU";
|
||||
MRUINFO mi = {
|
||||
sizeof(mi),
|
||||
26,
|
||||
MRU_CACHEWRITE,
|
||||
HKEY_CURRENT_USER,
|
||||
c_szRunMRU,
|
||||
NULL // NOTE: use default string compare
|
||||
// since this is a GLOBAL MRU
|
||||
};
|
||||
|
||||
if (const auto hMruList = _createMRUList(&mi))
|
||||
{
|
||||
auto freeMRUList = wil::scope_exit([=]() {
|
||||
_freeMRUList(hMruList);
|
||||
});
|
||||
|
||||
for (int nMax = _enumMRUList(hMruList, -1, NULL, 0), i = 0; i < nMax; ++i)
|
||||
{
|
||||
WCHAR szCommand[MAX_PATH + 2];
|
||||
|
||||
const auto length = _enumMRUList(hMruList, i, szCommand, ARRAYSIZE(szCommand));
|
||||
if (length > 1)
|
||||
{
|
||||
// clip off the null-terminator
|
||||
std::wstring_view text{ szCommand, wil::safe_cast<size_t>(length - 1) };
|
||||
//#pragma disable warning(C26493)
|
||||
#pragma warning( push )
|
||||
#pragma warning( disable : 26493 )
|
||||
if (text.back() == L'\\')
|
||||
{
|
||||
// old MRU format has a slash at the end with the show cmd
|
||||
text = { szCommand, wil::safe_cast<size_t>(length - 2) };
|
||||
#pragma warning( pop )
|
||||
if (text.empty())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
history.emplace_back(text);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update dropdown & initial value
|
||||
return winrt::single_threaded_observable_vector<winrt::hstring>(std::move(history));
|
||||
}
|
||||
}
|
||||
21
src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.h
Normal file
21
src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.h
Normal file
@@ -0,0 +1,21 @@
|
||||
#pragma once
|
||||
|
||||
#include "RunHistory.g.h"
|
||||
#include "types.h"
|
||||
|
||||
namespace winrt::Microsoft::Terminal::UI::implementation
|
||||
{
|
||||
struct RunHistory
|
||||
{
|
||||
RunHistory() = default;
|
||||
static winrt::Windows::Foundation::Collections::IVector<hstring> CreateRunHistory();
|
||||
|
||||
private:
|
||||
winrt::Windows::Foundation::Collections::IVector<hstring> _mruHistory;
|
||||
};
|
||||
}
|
||||
|
||||
namespace winrt::Microsoft::Terminal::UI::factory_implementation
|
||||
{
|
||||
BASIC_FACTORY(RunHistory);
|
||||
}
|
||||
11
src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.idl
Normal file
11
src/modules/cmdpal/Microsoft.Terminal.UI/RunHistory.idl
Normal file
@@ -0,0 +1,11 @@
|
||||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
namespace Microsoft.Terminal.UI
|
||||
{
|
||||
static runtimeclass RunHistory
|
||||
{
|
||||
static Windows.Foundation.Collections.IVector<String> CreateRunHistory();
|
||||
};
|
||||
|
||||
}
|
||||
@@ -64,6 +64,8 @@
|
||||
|
||||
// WIL
|
||||
#include <wil/com.h>
|
||||
#include <wil/resource.h>
|
||||
#include <wil/safecast.h>
|
||||
#include <wil/stl.h>
|
||||
#include <wil/filesystem.h>
|
||||
// Due to the use of RESOURCE_SUPPRESS_STL in result.h, we need to include resource.h first, which happens
|
||||
@@ -90,6 +92,7 @@
|
||||
|
||||
#include <winrt/Windows.ApplicationModel.Resources.h>
|
||||
#include <winrt/Windows.Foundation.h>
|
||||
#include <winrt/Windows.Foundation.Collections.h>
|
||||
|
||||
#include <winrt/Windows.Graphics.Imaging.h>
|
||||
#include <Windows.Graphics.Imaging.Interop.h>
|
||||
|
||||
23
src/modules/cmdpal/Microsoft.Terminal.UI/types.h
Normal file
23
src/modules/cmdpal/Microsoft.Terminal.UI/types.h
Normal file
@@ -0,0 +1,23 @@
|
||||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
#pragma once
|
||||
|
||||
#define MRU_CACHEWRITE 0x0002
|
||||
#define REGSTR_PATH_EXPLORER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
|
||||
|
||||
// https://learn.microsoft.com/en-us/windows/win32/shell/mrucmpproc
|
||||
typedef int(CALLBACK* MRUCMPPROC)(
|
||||
LPCTSTR pString1,
|
||||
LPCTSTR pString2);
|
||||
|
||||
// https://learn.microsoft.com/en-us/windows/win32/shell/mruinfo
|
||||
struct MRUINFO
|
||||
{
|
||||
DWORD cbSize;
|
||||
UINT uMax;
|
||||
UINT fFlags;
|
||||
HKEY hKey;
|
||||
LPCTSTR lpszSubKey;
|
||||
MRUCMPPROC lpfnCompare;
|
||||
};
|
||||
Reference in New Issue
Block a user