Merge pull request #11973 from keymanapp/chore/windows/11925/deprecat…

…e-qit-vshiftdown chore(windows): remove QIT_VSHIFTDOWN QIT _VSHIFTUP
keymanapp · Aug 5, 2024 · 64efd2a · 64efd2a
2 parents a6a49db + 4409972
commit 64efd2a
Show file tree

Hide file tree

Showing 8 changed files with 325 additions and 293 deletions.
diff --git a/developer/src/samples/imsample/imdllref.rtf b/developer/src/samples/imsample/imdllref.rtf
diff --git a/developer/src/samples/imsample/imlib.h b/developer/src/samples/imsample/imlib.h
@@ -4,8 +4,8 @@
 
 #define QIT_VKEYDOWN	0
 #define QIT_VKEYUP		1
-#define QIT_VSHIFTDOWN	2
-#define QIT_VSHIFTUP	3
+//#define QIT_VSHIFTDOWN	2 // deprecated see #11925
+//#define QIT_VSHIFTUP	3
 #define QIT_CHAR		4
 #define QIT_DEADKEY		5
 #define QIT_BELL		6

diff --git a/developer/src/tike/debug/UfrmDebugStatus_Events.pas b/developer/src/tike/debug/UfrmDebugStatus_Events.pas
@@ -116,8 +116,6 @@ procedure TfrmDebugStatus_Events.AddActionEvent(action: TDebugEventActionData);
 begin
   case action.ActionType of
     KM_CORE_IT_EMIT_KEYSTROKE: AddItem('emit_keystroke', action);
-//    QIT_VSHIFTDOWN:  AddItem('vshiftdown', action);
-//    QIT_VSHIFTUP:    AddItem('vshiftup', action);
     KM_CORE_IT_CHAR:        AddItem('char', action);
     KM_CORE_IT_MARKER:     AddItem('marker', action);
     KM_CORE_IT_ALERT:        AddItem('alert', action);

diff --git a/windows/src/engine/keyman32/appint/aiWin2000Unicode.cpp b/windows/src/engine/keyman32/appint/aiWin2000Unicode.cpp
@@ -178,10 +178,6 @@ BOOL AIWin2000Unicode::PostKeys()
         pInputs[i++].ki.dwExtraInfo = 0; //KEYEVENT_EXTRAINFO_KEYMAN;   // I4370   // I4378
       }
 
-		  break;
-	  case QIT_VSHIFTDOWN:
-		  break;
-	  case QIT_VSHIFTUP:
 		  break;
 	  case QIT_CHAR:
       pInputs[i].type = INPUT_KEYBOARD;

diff --git a/windows/src/engine/keyman32/appint/appint.cpp b/windows/src/engine/keyman32/appint/appint.cpp
@@ -28,8 +28,10 @@
 
 PWSTR decxstr(PWSTR p, PWSTR pStart);
 
+// QIT_VSHIFTDOWN and QIT_VSHIFTUP deprecated see #11925
+// Change to Deprecated to avoid array and index reshuffle
 const LPSTR ItemTypes[8] = {
-	"QIT_VKEYDOWN", "QIT_VKEYUP", "QIT_VSHIFTDOWN", "QIT_VSHIFTUP",
+	"QIT_VKEYDOWN", "QIT_VKEYUP", "QIT_DEPRECATED", "QIT_DEPRECATED",
     "QIT_CHAR", "QIT_DEADKEY", "QIT_BELL", "QIT_BACK" };
 
 /* AppActionQueue */

diff --git a/windows/src/engine/keyman32/appint/appint.h b/windows/src/engine/keyman32/appint/appint.h
@@ -34,8 +34,8 @@ typedef struct
 // QueueAction ItemTypes
 #define QIT_VKEYDOWN	0
 #define QIT_VKEYUP		1
-#define QIT_VSHIFTDOWN	2
-#define QIT_VSHIFTUP	3
+//#define QIT_VSHIFTDOWN	2  // deprecated see #11925
+//#define QIT_VSHIFTUP	3    // deprecated see #11925
 #define QIT_CHAR		4
 #define QIT_DEADKEY		5
 #define QIT_BELL		6

diff --git a/windows/src/engine/keyman32/kmprocess.cpp b/windows/src/engine/keyman32/kmprocess.cpp
@@ -178,10 +178,8 @@ BOOL ProcessHook()
       _td->app->GetQueueSize(), _td->app->IsLegacy(), _td->TIPFUpdateable);
 
     if (_td->app->IsLegacy()) {
-      _td->app->QueueAction(QIT_VSHIFTDOWN, Globals::get_ShiftState());
       _td->app->QueueAction(QIT_VKEYDOWN, _td->state.vkey);
       _td->app->QueueAction(QIT_VKEYUP, _td->state.vkey);
-      _td->app->QueueAction(QIT_VSHIFTUP, Globals::get_ShiftState());
       fOutputKeystroke = FALSE;
     }
 		else if (!_td->TIPFUpdateable) {

diff --git a/windows/src/engine/testhost/testhost.cpp b/windows/src/engine/testhost/testhost.cpp
@@ -223,8 +223,8 @@ typedef struct
 // QueueAction ItemTypes
 #define QIT_VKEYDOWN	0
 #define QIT_VKEYUP		1
-#define QIT_VSHIFTDOWN	2
-#define QIT_VSHIFTUP	3
+//#define QIT_VSHIFTDOWN	2 // deprecated see #11925
+//#define QIT_VSHIFTUP	3   // deprecated see #11925
 #define QIT_CHAR		4
 #define QIT_DEADKEY		5
 #define QIT_BELL		6
@@ -268,10 +268,6 @@ BOOL WINAPI PostKeyCallback(APPACTIONQUEUEITEM* Queue, int QueueSize) {
         //pInputs[i].ki.dwFlags = KEYEVENTF_KEYUP | ((Queue[n].dwData & QVK_EXTENDED) ? KEYEVENTF_EXTENDEDKEY : 0);  // I3438
       }
       break;
-    case QIT_VSHIFTDOWN:
-      break;
-    case QIT_VSHIFTUP:
-      break;
     case QIT_CHAR:
       // TODO: surrogate pairs
       PostMessage(hWndEdit, WM_CHAR, (WORD)Queue[n].dwData, 0);