Skip to content

Commit 712b31a

Browse files
haoliuuyeelam-gordon
haoliuu
authored and
yeelam-gordon
committed
Revert "[PowerAccent] Cancel previous ShowToolbar task if a new one is triggered" (#39563)
Revert "[PowerAccent] Cancel previous ShowToolbar task if a new one is triggered (#37757)" This reverts commit e1ad7e3.
1 parent 9907669 commit 712b31a

File tree

4 files changed

+25
-53
lines changed

4 files changed

+25
-53
lines changed

‎src/modules/poweraccent/PowerAccent.Core/PowerAccent.cs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ private void LoadUnicodeInfoCache()
6262

6363
private void SetEvents()
6464
{
65-
_keyboardListener.SetShowToolbarEvent(new PowerToys.PowerAccentKeyboardService.ShowToolbar((LetterKey letterKey, TriggerKey trigger ) =>
65+
_keyboardListener.SetShowToolbarEvent(new PowerToys.PowerAccentKeyboardService.ShowToolbar((LetterKey letterKey) =>
6666
{
6767
System.Windows.Application.Current.Dispatcher.Invoke(() =>
6868
{
69-
ShowToolbar(letterKey, trigger);
69+
ShowToolbar(letterKey);
7070
});
7171
}));
7272

@@ -92,15 +92,23 @@ private void SetEvents()
9292
}));
9393
}
9494

95-
private void ShowToolbar(LetterKey letterKey, TriggerKey trigger)
95+
private void ShowToolbar(LetterKey letterKey)
9696
{
9797
_visible = true;
9898

9999
_characters = GetCharacters(letterKey);
100100
_characterDescriptions = GetCharacterDescriptions(_characters);
101101
_showUnicodeDescription = _settingService.ShowUnicodeDescription;
102-
OnChangeDisplay?.Invoke(true, _characters);
103-
ProcessNextChar(trigger, false);
102+
103+
Task.Delay(_settingService.InputTime).ContinueWith(
104+
t =>
105+
{
106+
if (_visible)
107+
{
108+
OnChangeDisplay?.Invoke(true, _characters);
109+
}
110+
},
111+
TaskScheduler.FromCurrentSynchronizationContext());
104112
}
105113

106114
private string[] GetCharacters(LetterKey letterKey)

‎src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.cpp‎

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
1414
{
1515
KeyboardListener::KeyboardListener() :
16-
m_toolbarVisible(false), m_activationKeyHold(false), m_triggeredWithSpace(false), m_leftShiftPressed(false), m_rightShiftPressed(false), m_triggeredWithLeftArrow(false), m_triggeredWithRightArrow(false)
16+
m_toolbarVisible(false), m_triggeredWithSpace(false), m_leftShiftPressed(false), m_rightShiftPressed(false), m_triggeredWithLeftArrow(false), m_triggeredWithRightArrow(false)
1717
{
1818
s_instance = this;
1919
LoggerHelpers::init_logger(L"PowerAccent", L"PowerAccentKeyboardService", "PowerAccent");
@@ -53,8 +53,8 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
5353

5454
void KeyboardListener::SetShowToolbarEvent(ShowToolbar showToolbarEvent)
5555
{
56-
m_showToolbarCb = [trigger = std::move(showToolbarEvent)](LetterKey key, TriggerKey triggerKey) {
57-
trigger(key, triggerKey);
56+
m_showToolbarCb = [trigger = std::move(showToolbarEvent)](LetterKey key) {
57+
trigger(key);
5858
};
5959
}
6060

@@ -152,17 +152,6 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
152152
return false;
153153
}
154154

155-
void KeyboardListener::BeginShowToolbar(std::chrono::milliseconds delay, LetterKey key, TriggerKey trigger)
156-
{
157-
std::unique_lock<std::mutex> lock(toolbarMutex);
158-
auto result = toolbarCV.wait_for(lock, delay);
159-
if (result == std::cv_status::timeout)
160-
{
161-
m_toolbarVisible = true;
162-
m_showToolbarCb(key, trigger);
163-
}
164-
}
165-
166155
bool KeyboardListener::OnKeyDown(KBDLLHOOKSTRUCT info) noexcept
167156
{
168157
auto letterKey = static_cast<LetterKey>(info.vkCode);
@@ -210,29 +199,19 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
210199
}
211200
}
212201

213-
if (!m_toolbarVisible && !m_activationKeyHold && letterPressed != LetterKey::None && triggerPressed && !IsSuppressedByGameMode() && !IsForegroundAppExcluded())
202+
if (!m_toolbarVisible && letterPressed != LetterKey::None && triggerPressed && !IsSuppressedByGameMode() && !IsForegroundAppExcluded())
214203
{
215204
Logger::debug(L"Show toolbar. Letter: {}, Trigger: {}", letterPressed, triggerPressed);
216205

217206
// Keep track if it was triggered with space so that it can be typed on false starts.
218207
m_triggeredWithSpace = triggerPressed == VK_SPACE;
219208
m_triggeredWithLeftArrow = triggerPressed == VK_LEFT;
220209
m_triggeredWithRightArrow = triggerPressed == VK_RIGHT;
221-
m_activationKeyHold = true;
222-
m_bothKeysPressed = true;
223-
if (toolbarThread != nullptr)
224-
{
225-
toolbarCV.notify_all();
226-
toolbarThread->join();
227-
}
228-
toolbarThread = std::make_unique<std::thread>(std::bind(&KeyboardListener::BeginShowToolbar, this, m_settings.inputTime, letterPressed,static_cast<TriggerKey>(triggerPressed)));
210+
m_toolbarVisible = true;
211+
m_showToolbarCb(letterPressed);
229212
}
230213

231-
if (m_activationKeyHold && triggerPressed && !m_toolbarVisible)
232-
{
233-
return true;
234-
}
235-
else if (m_toolbarVisible && triggerPressed)
214+
if (m_toolbarVisible && triggerPressed)
236215
{
237216
if (triggerPressed == VK_LEFT)
238217
{
@@ -272,9 +251,8 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
272251
{
273252
letterPressed = LetterKey::None;
274253

275-
if (m_toolbarVisible || m_bothKeysPressed)
254+
if (m_toolbarVisible)
276255
{
277-
m_bothKeysPressed = false;
278256
if (m_stopwatch.elapsed() < m_settings.inputTime)
279257
{
280258
Logger::debug(L"Activation too fast. Do nothing.");
@@ -302,18 +280,11 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
302280
Logger::debug(L"Hide toolbar event and input char");
303281

304282
m_hideToolbarCb(InputType::Char);
283+
305284
m_toolbarVisible = false;
306285
}
307286
}
308287

309-
auto triggerPressed = info.vkCode;
310-
311-
if (m_activationKeyHold && (letterPressed == LetterKey::None || (triggerPressed == VK_SPACE || triggerPressed == VK_LEFT || triggerPressed == VK_RIGHT)))
312-
{
313-
m_activationKeyHold = false;
314-
toolbarCV.notify_all();
315-
}
316-
317288
return false;
318289
}
319290

‎src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.h‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "KeyboardListener.g.h"
44
#include <mutex>
5-
#include <thread>
65
#include <spdlog/stopwatch.h>
76

87
namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
@@ -45,22 +44,16 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
4544
static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
4645

4746
private:
48-
void BeginShowToolbar(std::chrono::milliseconds delay, LetterKey key, TriggerKey trigger);
4947
bool OnKeyDown(KBDLLHOOKSTRUCT info) noexcept;
5048
bool OnKeyUp(KBDLLHOOKSTRUCT info) noexcept;
5149
bool IsSuppressedByGameMode();
5250
bool IsForegroundAppExcluded();
5351

5452
static inline KeyboardListener* s_instance;
5553
HHOOK s_llKeyboardHook = nullptr;
56-
std::atomic<bool> m_toolbarVisible;
57-
bool m_activationKeyHold;
58-
bool m_bothKeysPressed = false;
59-
std::unique_ptr<std::thread> toolbarThread;
60-
std::mutex toolbarMutex;
61-
std::condition_variable toolbarCV;
54+
bool m_toolbarVisible;
6255
PowerAccentSettings m_settings;
63-
std::function<void(LetterKey, TriggerKey)> m_showToolbarCb;
56+
std::function<void(LetterKey)> m_showToolbarCb;
6457
std::function<void(InputType)> m_hideToolbarCb;
6558
std::function<void(TriggerKey, bool)> m_nextCharCb;
6659
std::function<bool(LetterKey)> m_isLanguageLetterCb;

‎src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.idl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace PowerToys
6767
Char
6868
};
6969

70-
[version(1.0), uuid(37197089-5438-4479-af57-30ab3f3c8be4)] delegate void ShowToolbar(LetterKey key, TriggerKey trigger);
70+
[version(1.0), uuid(37197089-5438-4479-af57-30ab3f3c8be4)] delegate void ShowToolbar(LetterKey key);
7171
[version(1.0), uuid(8eb79d6b-1826-424f-9fbc-af21ae19725e)] delegate void HideToolbar(InputType inputType);
7272
[version(1.0), uuid(db72d45c-a5a2-446f-bdc1-506e9121764a)] delegate void NextChar(TriggerKey inputSpace, boolean shiftPressed);
7373
[version(1.0), uuid(20be2919-2b91-4313-b6e0-4c3484fe91ef)] delegate void IsLanguageLetter(LetterKey key, [out] boolean* result);

0 commit comments

Comments
 (0)