OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

マウスカーソルへIMEモードの表示


Commit MetaInfo

Revision32c2da9cf5d3ed1c3a988abeec3a5c8feeddc79a (tree)
Time2023-10-03 11:56:10
AuthorJeffyTS <jeffyts@outl...>
CommiterJeffyTS

Log Message

1.1.8.4

Change Summary

Incremental Difference

--- a/FlushMouse/FlushMouse.cpp
+++ b/FlushMouse/FlushMouse.cpp
@@ -105,6 +105,13 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
105105 }
106106 }
107107 }
108+ else if ((iRet = CompareStringOrdinal(lpCmdLine, -1, L"/start", -1, TRUE)) != 0) {
109+ if (iRet == CSTR_EQUAL) {
110+ bReportEvent(MSG_START_FLUSHMOUSE, Shortcut_CATEGORY); // Eventlog
111+ if (hHandle != NULL) CloseHandle(hHandle);
112+ return 0;
113+ }
114+ }
108115 }
109116 if (hHandle != NULL) CloseHandle(hHandle);
110117 return 0;
Binary files a/FlushMouse32/FlushMouse32.rc and b/FlushMouse32/FlushMouse32.rc differ
Binary files a/FlushMouseCursor/FlushMouseCursor.rc and b/FlushMouseCursor/FlushMouseCursor.rc differ
--- a/FlushMouseDLL/EventlogData.h
+++ b/FlushMouseDLL/EventlogData.h
@@ -100,6 +100,15 @@
100100 #define Installer_CATEGORY ((DWORD)0x00000004L)
101101
102102 //
103+// MessageId: Shortcut_CATEGORY
104+//
105+// MessageText:
106+//
107+// Sortcut Events
108+//
109+#define Shortcut_CATEGORY ((DWORD)0x00000005L)
110+
111+//
103112 // MessageId: POWERNOTIFICATION_CATEGORY
104113 //
105114 // MessageText:
@@ -193,20 +202,20 @@
193202 #define MSG_QUIT_FLUSHMOUSE ((DWORD)0x40000005L)
194203
195204 //
196-// MessageId: MSG_RESTART_INSTALLER
205+// MessageId: MSG_START_FLUSHMOUSE
197206 //
198207 // MessageText:
199208 //
200-// Start FlushMouse(Installer).
209+// Start FlushMouse.
201210 //
202-#define MSG_RESTART_INSTALLER ((DWORD)0x00000006L)
211+#define MSG_START_FLUSHMOUSE ((DWORD)0x00000006L)
203212
204213 //
205214 // MessageId: MSG_DONE_FLUSHMOUSE
206215 //
207216 // MessageText:
208217 //
209-// Quit FlushMouse(Installer).
218+// Quit FlushMouse.
210219 //
211220 #define MSG_DONE_FLUSHMOUSE ((DWORD)0x00000007L)
212221
--- a/FlushMouseDLL/EventlogData.mc
+++ b/FlushMouseDLL/EventlogData.mc
@@ -79,6 +79,16 @@ Language=Japanese
7979 Installer Events
8080 .
8181
82+MessageId=0x5
83+SymbolicName=Shortcut_CATEGORY
84+Language=English
85+Sortcut Events
86+.
87+
88+Language=Japanese
89+Sortcut Events
90+.
91+
8292 MessageId=0x10
8393 SymbolicName=POWERNOTIFICATION_CATEGORY
8494 Language=English
@@ -203,13 +213,13 @@ FlushMouseを終了します。
203213 MessageId=0x0006
204214 Severity=Success
205215 Facility=Application
206-SymbolicName=MSG_RESTART_INSTALLER
216+SymbolicName=MSG_START_FLUSHMOUSE
207217 Language=English
208-Start FlushMouse(Installer).
218+Start FlushMouse.
209219 .
210220
211221 Language=Japanese
212-FlushMouseを起動します(Installer)。
222+FlushMouseを起動します。
213223 .
214224
215225 MessageId=0x0007
@@ -217,12 +227,13 @@ Severity=Success
217227 Facility=Application
218228 SymbolicName=MSG_DONE_FLUSHMOUSE
219229 Language=English
220-Quit FlushMouse(Installer).
230+Quit FlushMouse.
221231 .
222232
223233 Language=Japanese
224-FlushMouseを終了します(Installer)。
234+FlushMouseを終了します。
225235 .
236+
226237 MessageId=0x0008
227238 Severity=Success
228239 Facility=Application
Binary files a/FlushMouseDLL/FlushMouseDLL.rc and b/FlushMouseDLL/FlushMouseDLL.rc differ
--- a/FlushMouseDLL/KeyboardHookDll.cpp
+++ b/FlushMouseDLL/KeyboardHookDll.cpp
@@ -278,7 +278,6 @@ static LRESULT CALLBACK lpKeyboardHookLLProc(int nCode, WPARAM wParam, LPARAM lP
278278 PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, (KEY_OEM_COPY), (0x7f000000 & (static_cast<LPARAM>(lpstKBH->flags) << 24)));
279279 }
280280 break;
281- case VK_RETURN: // RETURN (0x0d)
282281 case VK_ESCAPE: // ESC (0x1b)
283282 case VK_INSERT: // INSERT (0x2d)
284283 bOnlyCtrlLL = FALSE;
Binary files a/FlushMouseDLL/MSG00409.bin and b/FlushMouseDLL/MSG00409.bin differ
Binary files a/FlushMouseDLL/MSG00411.bin and b/FlushMouseDLL/MSG00411.bin differ
Binary files a/FlushMouseDLL32/FlushMouseDLL32.rc and b/FlushMouseDLL32/FlushMouseDLL32.rc differ
--- a/FlushMouseLIB/Cursor.cpp
+++ b/FlushMouseLIB/Cursor.cpp
@@ -296,7 +296,7 @@ BOOL CCursor::_bStartDrawIMEModeThread(HWND hWndObserved)
296296 //
297297 BOOL CCursor::bShowHideCursor(HWND hWndObserved, BOOL bShow)
298298 {
299- BOOL bRet = FALSE;
299+ BOOL bRet = FALSE;
300300 if (bShow) {
301301 bRet = bStartDrawIMEModeThread(hWndObserved);
302302 }
@@ -311,8 +311,8 @@ BOOL CCursor::bShowHideCursor(HWND hWndObserved, BOOL bShow)
311311 //
312312 BOOL CCursor::bGetCaretPos(HWND hWnd, LPPOINT lpCaretPos)
313313 {
314- BOOL bRet = FALSE;
315- RECT rc{};
314+ BOOL bRet = FALSE;
315+ RECT rc{};
316316 lpCaretPos->x = 0; lpCaretPos->y = 0;
317317 if (_hGetCaretPosByAccessibleObjectFromWindow(hWnd, &rc) != NULL) {
318318 bRet = TRUE;
@@ -393,7 +393,7 @@ BOOL CCursor::bIMECursorChangeRoutine(LPVOID lpvParam)
393393 {
394394 LPIMECURSORDATA lpstCursorData = (LPIMECURSORDATA)lpvParam;
395395 CCursor *This = reinterpret_cast<CCursor*>(lpvParam);
396- BOOL bRet = TRUE;
396+ BOOL bRet = TRUE;
397397 if (lpstCursorData->bDisplayIMEModeOnCursor) {
398398 This->bIsIMECursorChanged(lpstCursorData);
399399 if (!This->bChangeFlushMouseCursor(lpstCursorData->dwIMEModeCursor, lpstCursorData)) {
@@ -429,7 +429,7 @@ BOOL WINAPI CCursor::_bDrawIMEModeRoutine(LPVOID lpvParam)
429429 {
430430 LPIMECURSORDATA lpstCursorData = (LPIMECURSORDATA)lpvParam;
431431 CCursor *This = reinterpret_cast<CCursor*>(lpvParam);
432- BOOL bRet = TRUE;
432+ BOOL bRet = TRUE;
433433 This->bIsIMECursorChanged(lpstCursorData);
434434 if (!This->bDrawIMEModeOnDisplay(lpstCursorData)) {
435435 _Post_equals_last_error_ DWORD err = GetLastError();
@@ -448,7 +448,7 @@ BOOL WINAPI CCursor::_bDrawIMEModeRoutine(LPVOID lpvParam)
448448 //
449449 BOOL CCursor::bIsIMECursorChanged(LPIMECURSORDATA lpstCursorData)
450450 {
451- DWORD dwIMEMode = (DWORD)(-1);
451+ DWORD dwIMEMode = (DWORD)(-1);
452452
453453 dwIMEMode = Cime->dwIMEMode(lpstCursorData->hWndObserved, lpstCursorData->bForceHiragana);
454454 if (lpstCursorData->dwIMEModeCursor == dwIMEMode) return FALSE;
@@ -461,8 +461,8 @@ BOOL CCursor::bIsIMECursorChanged(LPIMECURSORDATA lpstCursorData)
461461 //
462462 BOOL CCursor::bDrawIMEModeOnDisplay(LPIMECURSORDATA lpstCursorData)
463463 {
464- BOOL bRet = FALSE;
465- RECT rc{};
464+ BOOL bRet = FALSE;
465+ RECT rc{};
466466 if (lpstCursorData->bDrawIMEModeWait) {
467467 if (lpstCursorData->dwWaitWaveTime != 0) Sleep(lpstCursorData->dwWaitWaveTime);
468468 }
@@ -538,7 +538,7 @@ BOOL CCursor::_bCalcDispModeRect(int iModeSizeX, int iModeSizeY, LPRECT lpRect)
538538 //
539539 HWND CCursor::_hGetCaretPosByAccessibleObjectFromWindow(HWND hForeWnd, LPRECT lpRect)
540540 {
541- HWND hWnd = NULL;
541+ HWND hWnd = NULL;
542542 POINT pt{};
543543 DWORD dwPID = 0, dwForeThreadID = 0;
544544 if (hForeWnd != NULL) {
@@ -574,7 +574,7 @@ HWND CCursor::_hGetCaretPosByAccessibleObjectFromWindow(HWND hForeWnd, LPRECT l
574574 pt.x = lpGuiThreadInfo->rcCaret.right; pt.y = lpGuiThreadInfo->rcCaret.bottom;
575575 if (ClientToScreen(lpGuiThreadInfo->hwndCaret, &pt)) {
576576 lpRect->right = pt.x; lpRect->bottom = pt.y;
577- RECT rcFore{}, rcTop{};
577+ RECT rcFore{}, rcTop{};
578578 if (GetWindowRect(lpGuiThreadInfo->hwndCaret, &rcTop)) {
579579 #define MARGIN 2
580580 if (((pt.x == 0) && (pt.y == 0)) || (pt.x <= rcTop.left + MARGIN) || (pt.y <= rcTop.top + MARGIN) || (pt.x <= rcFore.left) || (pt.y <= rcFore.top)) {
@@ -700,7 +700,7 @@ BOOL CCursor::bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData)
700700 }
701701
702702 #define COUNT 10
703- BOOL bRet = FALSE;
703+ BOOL bRet = FALSE;
704704 int iCount = 0;
705705 if (lpstCursorData->dwDisplayModeTime != 0) iCount = (lpstCursorData->dwDisplayModeTime + (COUNT - 1)) / COUNT;
706706 else iCount = COUNT;
@@ -746,7 +746,7 @@ BOOL CCursor::bGetMouseRegValue(LPCTSTR szValue, LPTSTR szFile)
746746 {
747747 #define MOUSE_HKEY HKEY_CURRENT_USER
748748 #define MOUSE_SUBKEY _T("Control Panel\\Cursors")
749- BOOL bRet = FALSE;
749+ BOOL bRet = FALSE;
750750 CRegistry *CReg = new CRegistry;
751751 if (CReg->bReadRegValueString(MOUSE_HKEY, MOUSE_SUBKEY, szValue, szFile, _MAX_PATH)) {
752752 bRet = TRUE;
@@ -762,7 +762,7 @@ BOOL CCursor::bGetMouseRegValue(LPCTSTR szValue, LPTSTR szFile)
762762 //
763763 BOOL CCursor::bChangeFlushMouseCursor(UINT uCurID, LPIMECURSORDATA lpstCursorData)
764764 {
765- int i = 0;
765+ int i = 0;
766766 while (uCurID != lpstCursorData->lpstFlushMouseCursor[i].dwIMEMode) {
767767 ++i;
768768 }
@@ -782,7 +782,7 @@ BOOL CCursor::bChangeFlushMouseCursor(UINT uCurID, LPIMECURSORDATA lpstCursorDa
782782 BOOL CCursor::bSetSystemCursor(LPMOUSECURSOR lpstMC, int iCursorSizeX, int iCursorSizeY)
783783 {
784784 HCURSOR hCur;
785- UINT fuLoad = 0;
785+ UINT fuLoad = 0;
786786 if (lpstMC->bReadReg) {
787787 if (lpstMC->szFile[0] == '\0') return TRUE;
788788 fuLoad = (LR_VGACOLOR | LR_DEFAULTSIZE | LR_DEFAULTCOLOR | LR_CREATEDIBSECTION | LR_LOADFROMFILE);
@@ -1021,7 +1021,7 @@ void CCursorWindow::Cls_OnPaint(HWND hWnd)
10211021 PAINTSTRUCT ps{};
10221022 HDC hDC = BeginPaint(hWnd, &ps);
10231023 if (hDC != NULL) {
1024- RECT rc{};
1024+ RECT rc{};
10251025 if (GetClientRect(hWnd, &rc)) {
10261026 HBRUSH hBrush = NULL;
10271027 if ((hBrush = CreateSolidBrush(dwBackColor & 0x00ffffff)) != NULL) {
Binary files a/FlushMouseLIB/FlushMouse.rc and b/FlushMouseLIB/FlushMouse.rc differ
--- a/FlushMouseLIB/FlushMouseLIB.cpp
+++ b/FlushMouseLIB/FlushMouseLIB.cpp
@@ -626,11 +626,23 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
626626 if ((hForeWnd = GetForegroundWindow()) == NULL) return;
627627 DWORD dwBeforeIMEMode = Cime->dwIMEMode(hForeWnd, FALSE);
628628 if (bForExplorerPatcherSWS(hForeWnd, TRUE, TRUE, &hNewHKL, &hPreviousHKL)) {
629- if (dwBeforeIMEMode != IMEOFF) {
630- Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
629+ if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
630+ if (dwBeforeIMEMode != IMEOFF) {
631+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
632+ }
633+ else {
634+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
635+ Sleep(50);
636+ Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
637+ }
631638 }
632639 else {
633- Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
640+ if (dwBeforeIMEMode != IMEOFF) {
641+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
642+ }
643+ else {
644+ Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
645+ }
634646 }
635647 }
636648 }
@@ -679,9 +691,7 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
679691 PostMessage(hWnd, WM_SYSKEYDOWNUPEX, KEY_OEM_PA1, (0x80000000));
680692 }
681693 }
682- }
683- else {
684- if ((dwBeforeIMEMode != IMEOFF)) {
694+ else {
685695 Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
686696 }
687697 }
@@ -698,6 +708,8 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
698708 if ((hForeWnd = GetForegroundWindow()) == NULL) return;
699709 if (bForExplorerPatcherSWS(hForeWnd, TRUE, TRUE, &hNewHKL, &hPreviousHKL)) {
700710 if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
711+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
712+ Sleep(50);
701713 Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
702714 }
703715 else {
@@ -752,6 +764,8 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
752764 Cime->vIMEConvertModeChangeForced(hForeWnd, ZENKANA_IMEON);
753765 }
754766 else {
767+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
768+ Sleep(50);
755769 Cime->vIMEConvertModeChangeForced(hForeWnd, ZENKANA_IMEON);
756770 }
757771 }
@@ -781,14 +795,21 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
781795 }
782796 if (bEnableEPHelper || bIMEModeForced) {
783797 if ((hForeWnd = GetForegroundWindow()) == NULL) return;
798+ HWND hWndHidemaru = FindWindow(_T("Hidemaru32Class"), NULL);
799+ if ((hWndHidemaru != NULL) && (hForeWnd == hWndHidemaru)) {
800+ break;
801+ }
784802 DWORD dwBeforeIMEMode = Cime->dwIMEMode(hForeWnd, FALSE);
785803 if (bForExplorerPatcherSWS(hForeWnd, TRUE, TRUE, &hNewHKL, &hPreviousHKL)) {
786804 if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
787- if (dwBeforeIMEMode == IMEOFF) {
788- Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
805+ if (dwBeforeIMEMode != IMEOFF) {
806+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
789807 }
790808 else {
791809 Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
810+ Sleep(50);
811+ Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
812+ Sleep(50);
792813 }
793814 }
794815 else {
@@ -797,6 +818,7 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
797818 }
798819 else {
799820 Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
821+ Sleep(100);
800822 }
801823 }
802824 }
@@ -808,14 +830,21 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
808830 }
809831 if (bEnableEPHelper || bIMEModeForced) {
810832 if ((hForeWnd = GetForegroundWindow()) == NULL) return;
833+ HWND hWndHidemaru = FindWindow(_T("Hidemaru32Class"), NULL);
834+ if ((hWndHidemaru != NULL) && (hForeWnd == hWndHidemaru)) {
835+ break;
836+ }
811837 DWORD dwBeforeIMEMode = Cime->dwIMEMode(hForeWnd, FALSE);
812838 if (bForExplorerPatcherSWS(hForeWnd, TRUE, TRUE, &hNewHKL, &hPreviousHKL)) {
813839 if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
814- if (dwBeforeIMEMode == IMEOFF) {
815- Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
840+ if (dwBeforeIMEMode != IMEOFF) {
841+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
816842 }
817843 else {
818844 Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
845+ Sleep(50);
846+ Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
847+ Sleep(50);
819848 }
820849 }
821850 else {
@@ -824,9 +853,11 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
824853 }
825854 else {
826855 Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
856+ Sleep(100);
827857 }
828858 }
829859 }
860+ Sleep(10);
830861 }
831862 break;
832863 case KEY_OEM_BACKTAB: // OEM Alt+カタカナ/ひらがな (0xf5)
@@ -839,6 +870,8 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
839870 SetFocus(hForeWnd);
840871 if (bForExplorerPatcherSWS(hForeWnd, TRUE, TRUE, &hNewHKL, &hPreviousHKL)) {
841872 if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
873+ Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
874+ Sleep(50);
842875 Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
843876 }
844877 else {
@@ -959,11 +992,13 @@ BOOL bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, BOOL bIMEModeForc
959992 if ((bChangeToIME && (hkl != JP_IME)) || (hkl == US_ENG) || bIMEModeForcedChange) {
960993 hkl = JP_IME;
961994 if (ActivateKeyboardLayout(hkl, (KLF_SETFORPROCESS | KLF_REORDER)) != 0) {
962- if ((hkl = GetKeyboardLayout(dwThreadID)) != NULL) { // Re Check
995+ if ((hkl = GetKeyboardLayout(dwThreadID)) != NULL) {
963996 if (hkl != JP_IME) {
964997 if (bChangeHKLbySendInput(JP_IME, hkl)) {
965998 hkl = JP_IME;
966- bRet = TRUE;
999+ if (ActivateKeyboardLayout(hkl, (KLF_SETFORPROCESS | KLF_REORDER)) != 0) {
1000+ bRet = TRUE;
1001+ }
9671002 }
9681003 }
9691004 else {
@@ -972,6 +1007,11 @@ BOOL bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, BOOL bIMEModeForc
9721007 }
9731008 }
9741009 }
1010+ else {
1011+ if (ActivateKeyboardLayout(hkl, (KLF_SETFORPROCESS | KLF_REORDER)) != 0) {
1012+ bRet = TRUE;
1013+ }
1014+ }
9751015 }
9761016 }
9771017 }
@@ -1034,7 +1074,7 @@ BOOL bChangeHKLbySendInput(HKL hNewHKL, HKL hPreviousHKL)
10341074 //
10351075 BOOL CALLBACK bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam)
10361076 {
1037- HWND hIMWnd = NULL;
1077+ HWND hIMWnd = NULL;
10381078 if (ActivateKeyboardLayout((HKL)lParam, KLF_SETFORPROCESS) != 0) {
10391079 if ((hIMWnd = ImmGetDefaultIMEWnd(hWnd)) != NULL) {
10401080 SendMessage(hIMWnd, WM_INPUTLANGCHANGEREQUEST, (WPARAM)INPUTLANGCHANGE_SYSCHARSET, lParam);
Binary files a/FlushMouse_x64.msi and b/FlushMouse_x64.msi differ
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@
55
66 #### リリース情報
77
8-* **2023/08/24　　Version 1.1.7.24 をリリースしました**
8+* **2023/10/03　　Version 1.1.8.4 をリリースしました**
99
1010 * **(主な変更点)**
11- * マウスクリックでIMEモードを表示しないことがあるバグを修正しました
12- * 漢字(半角 / 全角)キーを押したときの処理を見直しました
11+ * EP HelperがONの時の無変換の処理のバグと、秀丸エディタを使用しているときの「漢字(半角/全角)」キーの処理を見直しました
12+ * デスクトップのショートカットからの起動方法を変更しました
1313 * その他、軽微なバグを修正しました
1414
1515 * 最近(2023/07以降)、[OSDN/FlushMouse](https://osdn.net/users/jeffyts/pf/FlushMouse/wiki/FrontPage) が、不安定なようですので、 [GitHub/FlushMouse](https://github.com/JeffyTS-JP/FlushMouse)の方をチェックしていただいたほうが良いかもしれません(どちらにも同じソースとバイナリを置くようにします)
@@ -57,9 +57,7 @@
5757 #### 設定のヒント
5858 * Windows 10 / 11ではマウスカーソルの形状や大きさを決める方法が複数あるため、下記の順番で設定することをお勧めします
5959 1. 設定→ディスプレイ→拡大縮小とレイアウトで、「ディスプレイの解像度」、「テキスト、アプリ、その他の項目のサイズ」、「表示スケールの詳細設定」を好みに設定します
60- 2. 設定→デバイス→マウス→「マウスとカーソルのサイズを調整する」で好みに設定します
61- * この変更を行うとマウスカーソルが、Windows 10 / 11特有のものになります
62- * もし、Windows 7などの以前のマウスカーソルを使いたい場合は３の設定をします。必要なければ４に進んでください
60+ 2. 設定→デバイス→マウス→「マウスとカーソルのサイズを調整する」で好みに設定します。ただし、この変更を行うとマウスカーソルが、Windows 10 / 11特有のものになります。もし、Windows 7などの以前のマウスカーソルを使いたい場合は３の設定をします。必要なければ４に進んでください
6361 3. 設定→デバイス→マウス→「その他のマウスオプション」(これはコントロールパネルのマウスのプロパティと同じ設定画面です)の、ポインタータブで、好みのカーソル形状、大きさに設定します
6462 4. システムトレイ(タスクトレイ)のFlushMouseのアイコンをクリックして設定を選択し、「マウスカーソルのサイズ」を好みの大きさに設定します
6563 * FlushMouseで設定するカーソルの大きさは、アプリケーション独自に表示するもの(例えばExcelの十字型のカーソルなど)には影響しませんので、１から３を繰り返して、それらが好みの大きさになるようにしてから、FlushMouseでコントロールするカーソルの大きさを合わせると使いやすくなると思います
--- a/SetupProject/Product.wxs
+++ b/SetupProject/Product.wxs
@@ -259,7 +259,7 @@
259259 <Component Id="DesktopShortcut" Guid="{2E074233-454E-41B4-918F-8C6A1FBAD304}">
260260 <Condition>WIXUI_VERIFYDIALOGOPTIONALCHECKBOX1 = 1</Condition>
261261 <RegistryValue Root="HKCU" Key="$(var.AppRegKey)" Name="InstalledDesktopShortcut" Type="integer" Value="1" KeyPath="yes" />
262- <Shortcut Id="desktopShortcut" Name="$(var.ProductName)" Target="[INSTALLFOLDER]$(var.MainExeFileName)" WorkingDirectory="INSTALLFOLDER" />
262+ <Shortcut Id="desktopShortcut" Name="$(var.ProductName)" Target="[INSTALLFOLDER]$(var.MainExeFileName)" Arguments="/start" WorkingDirectory="INSTALLFOLDER" />
263263 </Component>
264264 </DirectoryRef>
265265 <DirectoryRef Id="AppStartMenuDir">
--- a/version.h
+++ b/version.h
@@ -9,11 +9,11 @@
99
1010 #define MAJOR_VERSION 1
1111 #define MINOR_VERSION 1
12-#define BUILD_VERSION 7
13-#define REVISION_VERSION 24
12+#define BUILD_VERSION 8
13+#define REVISION_VERSION 0
1414
15-#define FILE_VERSION_STRING VALUE "FileVersion", "1.1.7.24"
16-#define PRODUCT_VERSION_STRING VALUE "ProductVersion", "1.1.7.24"
15+#define FILE_VERSION_STRING VALUE "FileVersion", "1.1.8.0"
16+#define PRODUCT_VERSION_STRING VALUE "ProductVersion", "1.1.8.0"
1717
1818 #define FILE_VERSION MAJOR_VERSION, MINOR_VERSION, BUILD_VERSION, REVISION_VERSION
1919 #define PRODUCT_VERSION MAJOR_VERSION, MINOR_VERSION, BUILD_VERSION, REVISION_VERSION
--- a/version.wxi
+++ b/version.wxi
@@ -1,7 +1,7 @@
11 <Include>
22 <!-- for wix Setup Project -->
33 <!-- Copyright (C) 2023 JeffyTS -->
4- <?define Version = "1.1.7.24" ?>
4+ <?define Version = "1.1.8.0" ?>
55
66 <?define ProductName = "FlushMouse" ?>
77 <?define Manufacturer = "JeffyTS" ?>