Release v0.6.48: chat language profiles and tabbed settings

src/app.cpp

@@ -958,6 +958,31 @@ void App::keyboard(const KBDLLHOOKSTRUCT &k, UINT mods)
             }
     }
 }
+void App::refreshChatContext()
+{
+    HWND target = GetForegroundWindow();
+    chatWindow = target;
+    activeChatTitle = chatTitle(target);
+    activeChat = settings.chatCycles.empty() ? L"" : chatKey(processName(target), activeChatTitle);
+}
+void App::switchChatLayout(bool reverse)
+{
+    HWND target = chatWindow;
+    auto key = activeChat;
+    if (!target || target != GetForegroundWindow() || key.empty() || windowChatKey(target) != key ||
+        !settings.chatCycles.contains(key) || busy.exchange(true)) return;
+    auto cycle = chatCycle(settings, key, layouts);
+    auto available = layouts;
+    resetInput();
+    enqueue([this, target, key, cycle, available, reverse]
+    {
+        struct Reset { std::atomic<bool> &busy; ~Reset() { busy = false; } } reset{busy};
+        auto valid = [&] { return GetForegroundWindow() == target && windowChatKey(target) == key; };
+        if (!valid()) return;
+        auto next = nextChatLayout(cycle, available, windowLayout(target), reverse);
+        if (next) switchWindowLayout(target, next, valid);
+    });
+}
 bool App::handleKeyboard(const KBDLLHOOKSTRUCT &key, bool down, UINT mods)
 {
     // Filter before capture, hotkey latching and typing history. External injected
@@ -1008,6 +1033,23 @@ bool App::handleKeyboard(const KBDLLHOOKSTRUCT &key, bool down, UINT mods)
             return 1; // Record the chord without executing a global shortcut or typing into an editor.
         }
     }
+    bool chatEnabled = false;
+    if (down && ChatSwitchHook::candidate(key.vkCode, mods) && !settings.chatCycles.empty() &&
+        !isHotkey(key.vkCode, mods))
+    {
+        refreshChatContext();
+        chatEnabled = !activeChat.empty() && settings.chatCycles.contains(activeChat);
+    }
+    const int chatAction = chatSwitchHook.update(key.vkCode, down, mods, chatEnabled);
+    if (chatAction)
+    {
+        if (chatAction > 0)
+        {
+            chord(0xE8); // Suppress the shell's bare Alt/Win action.
+            switchChatLayout(chatAction == 2); // Captures this chat before another keyboard event.
+        }
+        return true;
+    }
     if (down)
     {
         auto action = hotkeyHook.update(key.vkCode, true, mods, hookBindings);
@@ -1215,6 +1257,8 @@ void App::transform(int command, int snippet)
         available = layouts;
         version = inputVersion;
     }
+    const auto requestedChat = config.chatCycles.empty() ? L"" : windowChatKey(target);
+    config.cycle = chatCycle(config, requestedChat, available);
     enqueue(
         [this, target, recent, previous, config, available, version, command, snippet, attempt, manual, requestedAt, preDeferred]
         {
@@ -1520,9 +1564,9 @@ void App::transform(int command, int snippet)
                                 for (int i = 0; i < (int)available.size(); ++i)
                                     if (available[i].id == id && available[i].convertible)
                                         cycle.push_back(i);
-                            if (cycle.size() < 2)
+                            if (cycle.empty())
                             {
-                                reason = L"cycle-has-fewer-than-two-layouts";
+                                reason = L"cycle-has-no-layouts";
                                 if (automatic && tx.valid())
                                     chord(VK_RIGHT);
                                 return;
@@ -1839,7 +1883,7 @@ void App::trayMenu()
     if (utilities.empty())
         AppendMenuW(utilityMenu, MF_STRING | MF_GRAYED, 0,
                     utilitiesError ? L"Cannot read tools folder" : L"No utilities in tools folder");
-    AppendMenuW(menu, MF_POPUP, (UINT_PTR)utilityMenu, L"&Utilities");
+    AppendMenuW(menu, MF_POPUP, (UINT_PTR)utilityMenu, L"&Tools");
     AppendMenuW(menu, MF_SEPARATOR, 0, nullptr);
     AppendMenuW(menu, MF_STRING | (settings.awake ? MF_CHECKED : 0), 14, L"Keep screen a&wake");
     HMENU pause = CreatePopupMenu();