v2.5.4 fix: CefKeyEvent

Author: sxmxta

src/CEF_Events_Implement.inc

@@ -291,8 +291,11 @@ begin
 end;
 
 procedure TLCLEvent.ChromiumEvent_OnPreKeyEvent(Sender: TObject; const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: TCefEventHandle; out isKeyboardShortcut: boolean; out Result: boolean);
+var
+  TempEvent: PMCefKeyEvent;
 begin
-  SendEvent([Sender, browser, event, osEvent, @isKeyboardShortcut, @Result]);
+  TempEvent := CefKeyEventToGo(event^);
+  SendEvent([Sender, browser, @TempEvent, osEvent, @isKeyboardShortcut, @Result]);
 end;
 
 procedure TLCLEvent.ChromiumEvent_OnProtocolExecution(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; var allowOsExecution: boolean);
@@ -492,8 +495,11 @@ begin
 end;
 
 procedure TLCLEvent.ChromiumEvent_OnKeyEvent(Sender: TObject; const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: TCefEventHandle; out Result: boolean);
+var
+  TempEvent: PMCefKeyEvent;
 begin
-  SendEvent([Sender, browser, event, osEvent, @Result]);
+  TempEvent := CefKeyEventToGo(event^);
+  SendEvent([Sender, browser, @TempEvent, osEvent, @Result]);
 end;
 
 procedure TLCLEvent.ChromiumEvent_OnLoadStart(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; transitionType: TCefTransitionType);

src/CEF_LCL_Browser.inc

@@ -180,11 +180,16 @@ begin
   handleExceptionEnd
 end;
 
-procedure CEFBrowser_SendKeyEvent(const TObj: ICefBrowser; const event: PCefKeyEvent); extdecl;
+procedure CEFBrowser_SendKeyEvent(const TObj: ICefBrowser; const event: PPMCefKeyEvent); extdecl;
+var
+  TempEvent: TCefKeyEvent;
 begin
   handleExceptionBegin
   if TObj.GetHost <> nil then
-    TObj.GetHost.SendKeyEvent(event);
+  begin
+    TempEvent := CefKeyEventToPas(event^);
+    TObj.GetHost.SendKeyEvent(@TempEvent);
+  end;
   handleExceptionEnd
 end;
 

src/CEF_LCL_Chromium_Proc.inc

@@ -464,10 +464,13 @@ begin
   handleExceptionEnd
 end;
 
-procedure CEFChromium_SendKeyEvent(const TObj: TChromium; const event: PCefKeyEvent); extdecl;
+procedure CEFChromium_SendKeyEvent(const TObj: TChromium; const event: PPMCefKeyEvent); extdecl;
+var
+  TempEvent: TCefKeyEvent;
 begin
   handleExceptionBegin
-  TObj.SendKeyEvent(event);
+  TempEvent := CefKeyEventToPas(event^);
+  TObj.SendKeyEvent(@TempEvent);
   handleExceptionEnd
 end;
 

src/uCEF_LCL_ClientHandlersRef.pas

@@ -1080,22 +1080,28 @@ destructor TJsDialogHandlerRef.Destroy;
 
 {== KeyboardHandler ==}
 function TKeyboardHandlerRef.OnPreKeyEvent(const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: TCefEventHandle; out isKeyboardShortcut: boolean): boolean;
+var
+  TempEvent: PMCefKeyEvent;
 begin
   Result := False;
   if (PreKeyEventPtr <> nil) then
   begin
-    TCEFEventCallback.SendEvent(PreKeyEventPtr, [browser, event, osEvent, @isKeyboardShortcut, @Result]);
+    TempEvent := CefKeyEventToGo(event^);
+    TCEFEventCallback.SendEvent(PreKeyEventPtr, [browser, @TempEvent, osEvent, @isKeyboardShortcut, @Result]);
   end
   else
     Result := inherited OnPreKeyEvent(browser, event, osEvent, isKeyboardShortcut);
 end;
 
 function TKeyboardHandlerRef.OnKeyEvent(const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: TCefEventHandle): boolean;
+var
+  TempEvent: PMCefKeyEvent;
 begin
   Result := False;
   if (KeyEventPtr <> nil) then
   begin
-    TCEFEventCallback.SendEvent(KeyEventPtr, [browser, event, osEvent, @Result]);
+    TempEvent := CefKeyEventToGo(event^);
+    TCEFEventCallback.SendEvent(KeyEventPtr, [browser, @TempEvent, osEvent, @Result]);
   end
   else
     Result := inherited OnKeyEvent(browser, event, osEvent);

src/uCEF_LCL_Entity.pas

@@ -276,6 +276,18 @@   TSimulateMouseEvent = record
     pointerType: TCefSimulatedPointerType
   end;
 
+  PPMCefKeyEvent = ^PMCefKeyEvent;
+  PMCefKeyEvent = record
+    kind                    : TCefKeyEventType;
+    modifiers               : TCefEventFlags;
+    windows_key_code        : Integer;
+    native_key_code         : Integer;
+    is_system_key           : Integer;
+    character               : WideChar;
+    unmodified_character    : WideChar;
+    focus_on_editable_field : Integer;
+  end;
+
 //string to hash
 function StrToHash(const SoureStr: string): cardinal;
 //PChar 转 UnicodeString
@@ -325,6 +337,9 @@ function PdfPrintSettingsToPas(const AData: PMCefPdfPrintSettings): TCefPdfPrint
 function TouchHandleStateToGo(const AData: TCefTouchHandleState): PMCefTouchHandleState;
 function TouchHandleStateToPas(const AData: PMCefTouchHandleState): TCefTouchHandleState;
 
+function CefKeyEventToGo(const AData: TCefKeyEvent): PMCefKeyEvent;
+function CefKeyEventToPas(const AData: PMCefKeyEvent): TCefKeyEvent;
+
 
 
 var
@@ -827,6 +842,7 @@ function PdfPrintSettingsToGo(const AData: TCefPdfPrintSettings): PMCefPdfPrintS
 
 function PdfPrintSettingsToPas(const AData: PMCefPdfPrintSettings): TCefPdfPrintSettings;
 begin
+  Result.size                       := SizeOf(TCefPdfPrintSettings);
   Result.landscape                  := Integer(AData.landscape^);
   Result.print_background           := Integer(AData.print_background^);
   Result.scale                      := double(AData.scale^);
@@ -870,5 +886,29 @@ function TouchHandleStateToPas(const AData: PMCefTouchHandleState): TCefTouchHan
   Result.alpha             := integer(AData.alpha^);
 end;
 
+function CefKeyEventToGo(const AData: TCefKeyEvent): PMCefKeyEvent;
+begin
+  Result.kind                    := AData.kind;
+  Result.modifiers               := AData.modifiers;
+  Result.windows_key_code        := AData.windows_key_code;
+  Result.native_key_code         := AData.native_key_code;
+  Result.is_system_key           := AData.is_system_key;
+  Result.character               := AData.character;
+  Result.unmodified_character    := AData.unmodified_character;
+  Result.focus_on_editable_field := AData.focus_on_editable_field;
+end;
+
+function CefKeyEventToPas(const AData: PMCefKeyEvent): TCefKeyEvent;
+begin
+  Result.size                    := SizeOf(TCefKeyEvent);
+  Result.kind                    := AData.kind;
+  Result.modifiers               := AData.modifiers;
+  Result.windows_key_code        := AData.windows_key_code;
+  Result.native_key_code         := AData.native_key_code;
+  Result.is_system_key           := AData.is_system_key;
+  Result.character               := AData.character;
+  Result.unmodified_character    := AData.unmodified_character;
+  Result.focus_on_editable_field := AData.focus_on_editable_field;
+end;
 
 end.