paste_to_replace 옵션 추가

Author: yeshjho

Typoon/match/match.h

@@ -23,4 +23,5 @@ struct Match
     bool doNeedFullComposite;
     bool doKeepComposite;
     bool isKorEngInsensitive;
+    bool doPasteToReplace;
 };

Typoon/match/trigger_tree.cpp

@@ -162,7 +162,7 @@ void TriggerTree::Reconstruct(std::string_view matchesString, std::function<void
         {
             const auto& [originalTriggers, originalReplace, replaceImage, replaceCommand,
                 isCaseSensitive, isWord, doPropagateCase, uppercaseStyle, 
-                doNeedFullComposite, doKeepComposite, isKorEngInsensitive] = match;
+                doNeedFullComposite, doKeepComposite, isKorEngInsensitive, doPasteToReplace] = match;
 
             std::vector<std::wstring> triggers;
             if (isKorEngInsensitive)
@@ -209,7 +209,8 @@ void TriggerTree::Reconstruct(std::string_view matchesString, std::function<void
                 // TODO: Abstract the extra conditions of the options and warn the user if ignored
                 .propagateCase = doPropagateCase && !isCaseSensitive && replaceType == Ending::EReplaceType::TEXT,
                 .uppercaseStyle = uppercaseStyle,
-                .keepComposite = doKeepComposite && is_korean(replace.back()) && replaceType == Ending::EReplaceType::TEXT,
+                .keepComposite = doKeepComposite && is_korean(replace.back()) && replaceType == Ending::EReplaceType::TEXT && !doPasteToReplace,
+                .pasteToReplace = doPasteToReplace || replaceType == Ending::EReplaceType::IMAGE,
             };
 
             const EndingMetaData endingMetaDataBase{
@@ -617,7 +618,7 @@ void TriggerTree::OnInput(const InputMessage(&inputs)[MAX_INPUT_COUNT], int leng
 void TriggerTree::replaceString(const Ending& ending, const Agent& agent, std::wstring_view stroke, const InputMessage(&inputs)[MAX_INPUT_COUNT], int inputLength, int inputIndex, bool doNeedFullComposite)
 {
     const auto& [replaceStringIndex, replaceType, replaceStringLength, backspaceCount, cursorMoveCount,
-        propagateCase, uppercaseStyle, keepComposite] = ending;
+        propagateCase, uppercaseStyle, keepComposite, pasteToReplace] = ending;
 
     const std::wstring_view originalReplaceString{ mReplaceStrings.data() + replaceStringIndex, replaceStringLength };
 
@@ -646,10 +647,20 @@ void TriggerTree::replaceString(const Ending& ending, const Agent& agent, std::w
     {
         std::vector<FakeInput> fakeInputs{ backspaceCount, FakeInput{ FakeInput::EType::KEY, FakeInput::BACKSPACE_KEY } };
         const auto& [str, ret] = run_command_and_get_output(originalReplaceString);
-        fakeInputs.reserve(fakeInputs.size() + str.size());
-        for (wchar_t c : str)
+        if (pasteToReplace)
         {
-            fakeInputs.emplace_back(FakeInput::EType::LETTER, c);
+            push_current_clipboard_state();
+            set_clipboard_text(str);
+            // Popping the clipboard state is done in main.
+            fakeInputs.emplace_back(FakeInput::EType::HOT_KEY_PASTE);
+        }
+        else
+        {
+            fakeInputs.reserve(fakeInputs.size() + str.size());
+            for (wchar_t c : str)
+            {
+                fakeInputs.emplace_back(FakeInput::EType::LETTER, c);
+            }
         }
         send_fake_inputs(fakeInputs, false);
         return;
@@ -820,6 +831,28 @@ void TriggerTree::replaceString(const Ending& ending, const Agent& agent, std::w
 
     std::fill_n(std::back_inserter(fakeInputs), cursorMoveCount + additionalCursorMoveCount, FakeInput{ FakeInput::EType::KEY, FakeInput::LEFT_ARROW_KEY });
 
+    if (pasteToReplace)
+    {
+        const auto firstLetter = std::ranges::find(fakeInputs, FakeInput::EType::LETTER, &FakeInput::type);
+        const auto end = fakeInputs.end();
+        if (firstLetter != end)
+        {
+            const auto lastLetter = std::find_if(firstLetter, end, [](const FakeInput& input) { return input.type != FakeInput::EType::LETTER; });
+            std::wstring str;
+            str.reserve(std::distance(firstLetter, lastLetter));
+            for (auto it = firstLetter; it != lastLetter; ++it)
+            {
+                str += it->letter;
+            }
+
+            push_current_clipboard_state();
+            set_clipboard_text(str);
+            // Popping the clipboard state is done in main.
+            *firstLetter = FakeInput{ .type = FakeInput::EType::HOT_KEY_PASTE };
+            fakeInputs.erase(firstLetter + 1, lastLetter);
+        }
+    }
+
     for (FakeInput& fakeInput : fakeInputs)
     {
         if (fakeInput.type == FakeInput::EType::LETTER && fakeInput.letter == '\n')

Typoon/match/trigger_tree.h

@@ -74,7 +74,8 @@ struct Ending
     unsigned int cursorMoveCount = 0;
     bool propagateCase = false;  // Won't be true if the first letter is not cased.
     Match::EUppercaseStyle uppercaseStyle = Match::EUppercaseStyle::FIRST_LETTER;  // Only used if `propagateCase` is true.
-    bool keepComposite = false;  // Won't be true if the letter is not Korean or need full composite.
+    bool keepComposite = false;  // Won't be true if the letter is not Korean or need full composite or `pasteToReplace` is true.
+    bool pasteToReplace = false;
 };
 
 

Typoon/parse/parse_match.cpp

@@ -15,6 +15,7 @@ OptionContainerForParse& OptionContainerForParse::operator|=(const OptionContain
     full_composite |= other.full_composite;
     keep_composite |= other.keep_composite;
     kor_eng_insensitive |= other.kor_eng_insensitive;
+    paste_to_replace |= other.paste_to_replace;
 
     return *this;
 }
@@ -33,6 +34,7 @@ MatchForParse::operator Match() const
         .doNeedFullComposite = full_composite,
         .doKeepComposite = keep_composite,
         .isKorEngInsensitive = kor_eng_insensitive,
+        .doPasteToReplace = paste_to_replace,
     };
 
     if (!triggers.empty())

Typoon/parse/parse_match.h

@@ -26,10 +26,11 @@ struct OptionContainerForParse
     bool full_composite = false;
     bool keep_composite = false;
     bool kor_eng_insensitive = false;
+    bool paste_to_replace = false;
 
     OptionContainerForParse& operator|=(const OptionContainerForParse& other);
 
-    JSON5_MEMBERS(case_sensitive, word, propagate_case, uppercase_style, full_composite, keep_composite, kor_eng_insensitive)
+    JSON5_MEMBERS(case_sensitive, word, propagate_case, uppercase_style, full_composite, keep_composite, kor_eng_insensitive, paste_to_replace)
 };
 
 struct MatchForParse : OptionContainerForParse

WindowsInstaller/Product.wxs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Id="*" Name="Typoon" Language="!(loc.Language)" Version="$(var.VersionNumber)" Manufacturer="Joonho Hwang" UpgradeCode="eefadce2-887c-4f86-b767-59c8c5e6a710">
-        <Package InstallerVersion="400" Compressed="yes" InstallScope="perMachine" Comments="Typoon  Copyright (C) 2023-2025  Joonho Hwang" Platform="x64" />
+        <Package InstallerVersion="400" Compressed="yes" InstallScope="perMachine" Comments="Typoon  Copyright (C) 2023-2026  Joonho Hwang" Platform="x64" />
 
         <MajorUpgrade DowngradeErrorMessage="!(loc.NoDowngrade)" AllowSameVersionUpgrades="yes" />
         <MediaTemplate EmbedCab="yes"/>

WindowsInstaller/WindowsInstaller.wixproj

@@ -35,7 +35,7 @@
     <DefineConstants>Debug;</DefineConstants>
     <WixVariables>
     </WixVariables>
-    <CompilerAdditionalOptions>-dVersionNumber="0.2.1"</CompilerAdditionalOptions>
+    <CompilerAdditionalOptions>-dVersionNumber="0.3.0"</CompilerAdditionalOptions>
     <LinkerAdditionalOptions>-ext WixUIExtension -ext WixUtilExtension</LinkerAdditionalOptions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
@@ -45,7 +45,7 @@
     </DefineConstants>
     <WixVariables>
     </WixVariables>
-    <CompilerAdditionalOptions>-dVersionNumber="0.2.1"</CompilerAdditionalOptions>
+    <CompilerAdditionalOptions>-dVersionNumber="0.3.0"</CompilerAdditionalOptions>
     <LinkerAdditionalOptions>-ext WixUIExtension -ext WixUtilExtension</LinkerAdditionalOptions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">