diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54f5031..f9caa96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,9 +14,9 @@ name: Build on: - # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g., for dependabot pull requests) + # Trigger the workflow on pushes to only the 'develop' branch (this avoids duplicate checks being run e.g., for dependabot pull requests) push: - branches: [ main ] + branches: [ develop ] # Trigger the workflow on any pull request pull_request: @@ -203,7 +203,7 @@ jobs: # Cache Plugin Verifier IDEs - name: Setup Plugin Verifier IDEs Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 79ef821..e414b9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## [Unreleased] +## [1.0.2] - 2024-01-14 + +- [performance] Significantly reduced CPU and memory resource usage. + ## [1.0.1] - 2024-01-12 ### Fixed @@ -13,6 +17,7 @@ ## [1.0.0] - 2023-01-06 -[Unreleased]: https://github.com/lauvsong/LangCursor/compare/v1.0.1...HEAD +[Unreleased]: https://github.com/lauvsong/LangCursor/compare/v1.0.2...HEAD +[1.0.2]: https://github.com/lauvsong/LangCursor/compare/v1.0.1...v1.0.2 [1.0.1]: https://github.com/lauvsong/LangCursor/compare/v1.0.0...v1.0.1 [1.0.0]: https://github.com/lauvsong/LangCursor/commits/v1.0.0 diff --git a/CPP-Plugin/LanguageUtility/.gitignore b/CPP-Plugin/LanguageUtility/.gitignore new file mode 100644 index 0000000..4f3a34e --- /dev/null +++ b/CPP-Plugin/LanguageUtility/.gitignore @@ -0,0 +1,354 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ +/target + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# JetBrains Rider directory +.idea/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/CPP-Plugin/LanguageUtility/LanguageUtility.sln b/CPP-Plugin/LanguageUtility/LanguageUtility.sln new file mode 100644 index 0000000..6ae8203 --- /dev/null +++ b/CPP-Plugin/LanguageUtility/LanguageUtility.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LanguageUtility", "LanguageUtility\LanguageUtility.vcxproj", "{72F62326-60BE-4E19-9536-9BD800159D6B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {72F62326-60BE-4E19-9536-9BD800159D6B}.Debug|Win32.ActiveCfg = Debug|Win32 + {72F62326-60BE-4E19-9536-9BD800159D6B}.Debug|Win32.Build.0 = Debug|Win32 + {72F62326-60BE-4E19-9536-9BD800159D6B}.Debug|x64.ActiveCfg = Debug|x64 + {72F62326-60BE-4E19-9536-9BD800159D6B}.Debug|x64.Build.0 = Debug|x64 + {72F62326-60BE-4E19-9536-9BD800159D6B}.Release|Win32.ActiveCfg = Release|Win32 + {72F62326-60BE-4E19-9536-9BD800159D6B}.Release|Win32.Build.0 = Release|Win32 + {72F62326-60BE-4E19-9536-9BD800159D6B}.Release|x64.ActiveCfg = Release|x64 + {72F62326-60BE-4E19-9536-9BD800159D6B}.Release|x64.Build.0 = Release|x64 + EndGlobalSection +EndGlobal diff --git a/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.cpp b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.cpp new file mode 100644 index 0000000..e258142 --- /dev/null +++ b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.cpp @@ -0,0 +1,26 @@ +#include "LanguageUtility.h" + +/** + * @brief Check if the input window's IME (Input Method Editor) is set to English mode. + * + * This function checks the conversion status of the input window's IME and + * returns true if the IME is set to English mode (IME_CMODE_ALPHANUMERIC), + * otherwise returns false. + * + * @param h_wnd The handle to the input window. + * @return Returns true if the IME is set to English mode, otherwise false. + */ +bool isEnglish(const HWND h_wnd) +{ + const HIMC h_imc = ImmGetContext(h_wnd); + DWORD conversion; + DWORD sentence; + + if (ImmGetConversionStatus(h_imc, &conversion, &sentence)) + { + if (conversion == IME_CMODE_ALPHANUMERIC) + return true; + } + + return false; +} \ No newline at end of file diff --git a/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.h b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.h new file mode 100644 index 0000000..f5823be --- /dev/null +++ b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.h @@ -0,0 +1,19 @@ +#pragma once +#include + +#ifndef LANGUAGE_UTILITY_H +#define LANGUAGE_UTILITY_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DllExport __declspec(dllexport) + +DllExport bool isEnglish(HWND h_wnd); + +#ifdef __cplusplus +} +#endif + +#endif // LANGUAGE_UTILITY_H \ No newline at end of file diff --git a/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.vcxproj b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.vcxproj new file mode 100644 index 0000000..1b42299 --- /dev/null +++ b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + 15.0 + {72F62326-60BE-4E19-9536-9BD800159D6B} + Win32Proj + LanguageUtility + 10.0 + + + + x64 + + + DynamicLibrary + true + v143 + Unicode + + + DynamicLibrary + false + v143 + true + Unicode + + + DynamicLibrary + true + v143 + Unicode + + + DynamicLibrary + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;CPPDYNAMICLIBRARYTEMPLATE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + + + Windows + true + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;CPPDYNAMICLIBRARYTEMPLATE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + + + Windows + true + $(CoreLibraryDependencies);%(AdditionalDependencies);imm32.lib + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;CPPDYNAMICLIBRARYTEMPLATE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + + + Windows + true + true + true + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;CPPDYNAMICLIBRARYTEMPLATE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + pch.h + + + Windows + true + true + true + $(CoreLibraryDependencies);%(AdditionalDependencies);imm32.lib + + + + + + \ No newline at end of file diff --git a/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.vcxproj.filters b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.vcxproj.filters new file mode 100644 index 0000000..255b476 --- /dev/null +++ b/CPP-Plugin/LanguageUtility/LanguageUtility/LanguageUtility.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9c3fcdc..7da2544 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ pluginGroup = com.github.lauvsong.langcursor pluginName = LangCursor pluginRepositoryUrl = https://github.com/lauvsong/LangCursor # SemVer format -> https://semver.org -pluginVersion= 1.0.2 +pluginVersion= 1.0.3 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 231 diff --git a/src/main/kotlin/com/github/lauvsong/langcursor/core/LanguageCheckStrategy.kt b/src/main/kotlin/com/github/lauvsong/langcursor/core/LanguageCheckStrategy.kt new file mode 100644 index 0000000..2a6c9bf --- /dev/null +++ b/src/main/kotlin/com/github/lauvsong/langcursor/core/LanguageCheckStrategy.kt @@ -0,0 +1,27 @@ +package com.github.lauvsong.langcursor.core + +import com.github.lauvsong.langcursor.utils.WindowsLanguageUtil +import com.jcraft.jsch.agentproxy.connector.PageantConnector +import java.awt.im.InputContext +import java.util.* + +fun interface LanguageCheckStrategy { + fun isEnglishInput(): Boolean +} + +val defaultLanguageCheckStrategy = LanguageCheckStrategy { + val locale = InputContext.getInstance().locale + val language = locale.language + val country = locale.country + + language == Locale.ENGLISH.language + || country == Locale.US.country + || country == Locale.UK.country +} + +val windowsLanguageCheckStrategy = LanguageCheckStrategy { + PageantConnector.User32.INSTANCE.GetForegroundWindow() + ?.let { hwnd -> + WindowsLanguageUtil.INSTANCE.isEnglish(hwnd.pointer) + } ?: false +} \ No newline at end of file diff --git a/src/main/kotlin/com/github/lauvsong/langcursor/services/LanguageCheckService.kt b/src/main/kotlin/com/github/lauvsong/langcursor/services/LanguageCheckService.kt index 2eb565c..a910107 100644 --- a/src/main/kotlin/com/github/lauvsong/langcursor/services/LanguageCheckService.kt +++ b/src/main/kotlin/com/github/lauvsong/langcursor/services/LanguageCheckService.kt @@ -1,13 +1,16 @@ package com.github.lauvsong.langcursor.services -import java.awt.im.InputContext -import java.util.* +import com.github.lauvsong.langcursor.core.LanguageCheckStrategy +import com.github.lauvsong.langcursor.core.defaultLanguageCheckStrategy +import com.github.lauvsong.langcursor.core.windowsLanguageCheckStrategy +import org.apache.commons.lang3.SystemUtils import java.util.concurrent.Executors import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.TimeUnit object LanguageCheckService { + private val languageCheckStrategy: LanguageCheckStrategy = setLanguageCheckStrategy() private val scheduledExecutor: ScheduledExecutorService = Executors.newScheduledThreadPool(1) private const val INTERVAL_MILLIS = 200L @@ -29,34 +32,17 @@ object LanguageCheckService { } private fun switchCursorColorByLanguage() { - if (isEnglishInput()) { + if (languageCheckStrategy.isEnglishInput()) { CursorColorService.toOriginalCursorColor() } else { CursorColorService.toNotEnglishCursorColor() } } - private fun isEnglishInput(): Boolean { - val locale = InputContext.getInstance().locale - val language = locale.language - val country = locale.country - - // Explanation for not solely relying on constant `Locale.ENGLISH`: - // In some Locale configurations, the language code might not be explicitly provided. - // e.g., "_US_UserDefined_252" - // Therefore, Locales with country codes are also considered as English input. - // Canada (CA) is not included here because both English and French are used in Canada. - // ** If you encounter any edge cases, please feel free to open an issue on GitHub. ** - if (language == Locale.ENGLISH.language) { - return true + private fun setLanguageCheckStrategy(): LanguageCheckStrategy = + if (SystemUtils.IS_OS_WINDOWS) { + windowsLanguageCheckStrategy + } else { + defaultLanguageCheckStrategy } - - if (country == Locale.US.country - || country == Locale.UK.country - ) { - return true - } - - return false - } } \ No newline at end of file diff --git a/src/main/kotlin/com/github/lauvsong/langcursor/utils/WindowsLanguageUtil.kt b/src/main/kotlin/com/github/lauvsong/langcursor/utils/WindowsLanguageUtil.kt new file mode 100644 index 0000000..43d1182 --- /dev/null +++ b/src/main/kotlin/com/github/lauvsong/langcursor/utils/WindowsLanguageUtil.kt @@ -0,0 +1,13 @@ +package com.github.lauvsong.langcursor.utils + +import com.sun.jna.Library +import com.sun.jna.Native +import com.sun.jna.Pointer + +interface WindowsLanguageUtil : Library { + fun isEnglish(hWnd: Pointer?): Boolean + + companion object { + val INSTANCE: WindowsLanguageUtil = Native.load("LanguageUtility", WindowsLanguageUtil::class.java) + } +} \ No newline at end of file diff --git a/src/main/resources/LanguageUtility.dll b/src/main/resources/LanguageUtility.dll new file mode 100644 index 0000000..8b9e7e5 Binary files /dev/null and b/src/main/resources/LanguageUtility.dll differ