paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-11 11:59:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: COCOA: ADD IME fully support (2/2): create TCocoaFullControlEdit in TCocoaWSCustomControl.CreateHandle()

Browse Source
This commit is contained in:
rich2014 2022-11-20 17:21:19 +08:00
parent 2089bc515d
commit 4def4177ba
1 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lcl/interfaces/cocoa/cocoawscommon.pas
View File

@ -56,7 +56,7 @@ type
procedure KeyEvBeforeUp; procedure KeyEvBeforeUp;
procedure KeyEvAfterUp; procedure KeyEvAfterUp;
procedure KeyEvFlagsChanged(Event: NSEvent); procedure KeyEvFlagsChanged(Event: NSEvent);
procedure KeyEvPrepare(Event: NSEvent); procedure KeyEvPrepare(Event: NSEvent); virtual;
public public
Owner: NSObject; Owner: NSObject;
HandleFrame: NSView; // HWND and "frame" (rectangle) of the a control HandleFrame: NSView; // HWND and "frame" (rectangle) of the a control
@ -119,6 +119,14 @@ type
TLCLCommonCallBackClass = class of TLCLCommonCallBack; TLCLCommonCallBackClass = class of TLCLCommonCallBack;
{ TLCLFullControlEditCallBack }
// CallBack for LCL Full Control Edit (such as SynEdit/ATSynEdit)
TLCLFullControlEditCallBack = class(TLCLCommonCallBack)
protected
procedure KeyEvPrepare(Event: NSEvent); override;
end;
{ TCocoaWSWinControl } { TCocoaWSWinControl }
{ TCocoaWSControl } { TCocoaWSControl }
@ -1558,7 +1566,7 @@ begin
while (i<=length(utf8)) do while (i<=length(utf8)) do
begin begin
c := Utf8CodePointLen(@utf8[i], length(utf8)-i+1, false); c := Utf8CodePointLen(@utf8[i], length(utf8)-i+1, false);
ch := Copy(utf8, 1, c); ch := Copy(utf8, i, c);
FTarget.IntfUTF8KeyPress(ch, 1, false); FTarget.IntfUTF8KeyPress(ch, 1, false);
inc(i, c); inc(i, c);
end; end;
@ -1580,6 +1588,22 @@ begin
Result := Assigned(FTarget) and FTarget.Enabled; Result := Assigned(FTarget) and FTarget.Enabled;
end; end;
{ TLCLFullControlEditCallBack }
{
Key Step for IME (such as Chinese/Japanese/Korean and DeadKeys)
1. set _sendChar:=false to avoid KeyDown Event being eaten
in IntfUTF8KeyPress() or CN_CHAR message.
2. KeyDown Event will be handled in TCocoaFullControlEdit.keyDown(),
and NSInputContext.sendEvent() will be called in it,
and function in NSTextInputClient will be called.
}
procedure TLCLFullControlEditCallback.KeyEvPrepare(Event: NSEvent);
begin
inherited;
_sendChar := false;
end;
{ TCocoaWSControl } { TCocoaWSControl }
class function TCocoaWSControl.GetCanvasScaleFactor(const AControl: TControl class function TCocoaWSControl.GetCanvasScaleFactor(const AControl: TControl
@ -1951,6 +1975,15 @@ end;
{ TCocoaWSCustomControl } { TCocoaWSCustomControl }
// get IMEHandler by LM_IM_COMPOSITION message
function getControlIMEHandler(const control: TWinControl): ICocoaIMEControl;
var
handle : PtrInt;
begin
handle := SendSimpleMessage(control, LM_IM_COMPOSITION);
Result := TObject(handle) as ICocoaIMEControl
end;
class function TCocoaWSCustomControl.CreateHandle(const AWinControl: TWinControl; class function TCocoaWSCustomControl.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle; const AParams: TCreateParams): TLCLIntfHandle;
var var
@ -1958,10 +1991,25 @@ var
sl : TCocoaManualScrollView; sl : TCocoaManualScrollView;
hs : TCocoaManualScrollHost; hs : TCocoaManualScrollHost;
lcl : TLCLCommonCallback; lcl : TLCLCommonCallback;
imeHandler : ICocoaIMEControl;
begin begin
ctrl := TCocoaCustomControl(TCocoaCustomControl.alloc.lclInitWithCreateParams(AParams)); imeHandler := getControlIMEHandler(AWinControl);
lcl := TLCLCommonCallback.Create(ctrl, AWinControl); if Assigned(imeHandler) then
begin
// AWinControl implements ICocoaIMEControl
// AWinControl is a Full Control Edit (such as SynEdit/ATSynEdit)
ctrl := TCocoaFullControlEdit.alloc.lclInitWithCreateParams(AParams);
lcl := TLCLFullControlEditCallback.Create(ctrl, AWinControl);
TCocoaFullControlEdit(ctrl).imeHandler := imeHandler;
ctrl.unmarkText;
end
else
begin
// AWinControl not implements ICocoaIMEControl
// AWinControl is a normal Custom Control
ctrl := TCocoaCustomControl.alloc.lclInitWithCreateParams(AParams);
lcl := TLCLCommonCallback.Create(ctrl, AWinControl);
end;
lcl.BlockCocoaUpDown := true; lcl.BlockCocoaUpDown := true;
lcl.BlockCocoaKeyBeep := true; // prevent "dings" on keyDown for custom controls (i.e. SynEdit) lcl.BlockCocoaKeyBeep := true; // prevent "dings" on keyDown for custom controls (i.e. SynEdit)
ctrl.callback := lcl; ctrl.callback := lcl;