pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-09-30 21:28:55 +02:00
Code Issues Actions Releases Activity

Fixed build issue in QT projects

Browse Source
This commit is contained in:
Salvador Díaz Fau
2025-09-13 16:06:23 +02:00
parent 9d38ca7ee7
commit c9aba9c250
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/uCEFLinuxFunctions.pas
View File

@@ -28,7 +28,6 @@ const
{$ENDIF} {$ENDIF}
{$IFDEF LINUX} {$IFDEF LINUX}
procedure GdkEventKeyToCEFKeyEvent(GdkEvent: PGdkEventKey; var aCEFKeyEvent : TCEFKeyEvent);
function KeyboardCodeFromXKeysym(keysym : uint32) : integer; function KeyboardCodeFromXKeysym(keysym : uint32) : integer;
{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or (DEFINED(LCLGTK3) and (LCL_FULLVERSION<3000000))} {$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or (DEFINED(LCLGTK3) and (LCL_FULLVERSION<3000000))}
function GetCefStateModifiers(state : uint32) : integer; function GetCefStateModifiers(state : uint32) : integer;
@@ -36,9 +35,12 @@ function GetCefStateModifiers(state : uint32) : integer;
{$IF DEFINED(LCLGTK3) and (LCL_FULLVERSION>3000000)} {$IF DEFINED(LCLGTK3) and (LCL_FULLVERSION>3000000)}
function GetCefStateModifiers(state : TGdkModifierType) : integer; function GetCefStateModifiers(state : TGdkModifierType) : integer;
{$IFEND} {$IFEND}
function GdkEventToWindowsKeyCode(Event: PGdkEventKey) : integer;
function GetWindowsKeyCodeWithoutLocation(key_code : integer) : integer; function GetWindowsKeyCodeWithoutLocation(key_code : integer) : integer;
function GetControlCharacter(windows_key_code : integer; shift : boolean) : integer; function GetControlCharacter(windows_key_code : integer; shift : boolean) : integer;
{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or DEFINED(LCLGTK3)}
procedure GdkEventKeyToCEFKeyEvent(GdkEvent: PGdkEventKey; var aCEFKeyEvent : TCEFKeyEvent);
function GdkEventToWindowsKeyCode(Event: PGdkEventKey) : integer;
{$IFEND}
{$IFDEF FMX} {$IFDEF FMX}
type type
@@ -520,30 +522,6 @@ begin
end; end;
{$IFEND} {$IFEND}
function GdkEventToWindowsKeyCode(event: PGdkEventKey) : integer;
var
windows_key_code, keyval : integer;
begin
windows_key_code := KeyboardCodeFromXKeysym(event^.keyval);
if (windows_key_code <> 0) then
begin
Result := windows_key_code;
exit;
end;
if (event^.hardware_keycode < length(kHardwareCodeToGDKKeyval)) then
begin
keyval := kHardwareCodeToGDKKeyval[event^.hardware_keycode];
if (keyval <> 0) then
begin
Result := KeyboardCodeFromXKeysym(keyval);
exit;
end;
end;
Result := KeyboardCodeFromXKeysym(event^.keyval);
end;
function GetWindowsKeyCodeWithoutLocation(key_code : integer) : integer; function GetWindowsKeyCodeWithoutLocation(key_code : integer) : integer;
begin begin
case key_code of case key_code of
@@ -576,6 +554,7 @@ begin
end; end;
end; end;
{$IF DEFINED(LINUXFMX) or DEFINED(LCLGTK2) or DEFINED(LCLGTK3)}
procedure GdkEventKeyToCEFKeyEvent(GdkEvent: PGdkEventKey; var aCEFKeyEvent : TCEFKeyEvent); procedure GdkEventKeyToCEFKeyEvent(GdkEvent: PGdkEventKey; var aCEFKeyEvent : TCEFKeyEvent);
var var
windows_key_code : integer; windows_key_code : integer;
@@ -603,6 +582,31 @@ begin
aCEFKeyEvent.character := aCEFKeyEvent.unmodified_character; aCEFKeyEvent.character := aCEFKeyEvent.unmodified_character;
end; end;
function GdkEventToWindowsKeyCode(event: PGdkEventKey) : integer;
var
windows_key_code, keyval : integer;
begin
windows_key_code := KeyboardCodeFromXKeysym(event^.keyval);
if (windows_key_code <> 0) then
begin
Result := windows_key_code;
exit;
end;
if (event^.hardware_keycode < length(kHardwareCodeToGDKKeyval)) then
begin
keyval := kHardwareCodeToGDKKeyval[event^.hardware_keycode];
if (keyval <> 0) then
begin
Result := KeyboardCodeFromXKeysym(keyval);
exit;
end;
end;
Result := KeyboardCodeFromXKeysym(event^.keyval);
end;
{$IFEND}
{$IFDEF FMX} {$IFDEF FMX}
function g_signal_connect(instance: gpointer; detailed_signal: Pgchar; c_handler: TGCallback; data: gpointer): gulong; function g_signal_connect(instance: gpointer; detailed_signal: Pgchar; c_handler: TGCallback; data: gpointer): gulong;
begin begin

2
update_CEF4Delphi.json
View File

@@ -2,7 +2,7 @@
"UpdateLazPackages" : [ "UpdateLazPackages" : [
{ {
"ForceNotify" : true, "ForceNotify" : true,
"InternalVersion" : 782, "InternalVersion" : 783,
"Name" : "cef4delphi_lazarus.lpk", "Name" : "cef4delphi_lazarus.lpk",
"Version" : "139.0.40" "Version" : "139.0.40"
} }