|
@@ -223,16 +223,23 @@ Type
|
|
private
|
|
private
|
|
FRelated: TObject;
|
|
FRelated: TObject;
|
|
Public
|
|
Public
|
|
- class function FresnelEventID : TEventID; override;
|
|
|
|
|
|
+ class function FresnelEventID : TEventID; override;
|
|
Property Related : TObject Read FRelated Write FRelated;
|
|
Property Related : TObject Read FRelated Write FRelated;
|
|
end;
|
|
end;
|
|
TFLMouseLeaveEvent = TFresnelMouseLeaveEvent;
|
|
TFLMouseLeaveEvent = TFresnelMouseLeaveEvent;
|
|
|
|
|
|
TFresnelKeyEventInit = Record
|
|
TFresnelKeyEventInit = Record
|
|
|
|
+ // State of shift keys
|
|
ShiftState : TShiftState;
|
|
ShiftState : TShiftState;
|
|
|
|
+ // Composing ?
|
|
IsComposing : Boolean;
|
|
IsComposing : Boolean;
|
|
- NumKey : Cardinal;
|
|
|
|
|
|
+ // Numerical key value:
|
|
|
|
+ // if positive, unicode char
|
|
|
|
+ // If negative: special key (see TKeyCodes).
|
|
|
|
+ NumKey : Integer;
|
|
|
|
+ // Key name: resolved unicode ("A" on Azerty) char or special key name (see TKeyNames)
|
|
Key : String;
|
|
Key : String;
|
|
|
|
+ // Key code: key code ("Q" on Azerty) or special key name (see TKeyNames)
|
|
Code : ShortString;
|
|
Code : ShortString;
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -244,15 +251,17 @@ Type
|
|
function GetShiftKey(AIndex: Integer): Boolean;
|
|
function GetShiftKey(AIndex: Integer): Boolean;
|
|
Public
|
|
Public
|
|
Constructor Create(const aInit : TFresnelKeyEventInit);
|
|
Constructor Create(const aInit : TFresnelKeyEventInit);
|
|
|
|
+ function ShiftState : TShiftState;
|
|
Property Code: ShortString Read FInit.Code;
|
|
Property Code: ShortString Read FInit.Code;
|
|
Property Key : String Read Finit.Key;
|
|
Property Key : String Read Finit.Key;
|
|
- Property NumKey : Cardinal Read Finit.NumKey;
|
|
|
|
|
|
+ Property NumKey : Integer Read Finit.NumKey;
|
|
Property Altkey : Boolean Index Ord(ssAlt) read GetShiftKey;
|
|
Property Altkey : Boolean Index Ord(ssAlt) read GetShiftKey;
|
|
Property MetaKey : Boolean Index Ord(ssMeta) read GetShiftKey;
|
|
Property MetaKey : Boolean Index Ord(ssMeta) read GetShiftKey;
|
|
Property CtrlKey : Boolean Index Ord(ssCtrl) read GetShiftKey;
|
|
Property CtrlKey : Boolean Index Ord(ssCtrl) read GetShiftKey;
|
|
Property ShiftKey : Boolean Index Ord(ssShift) read GetShiftKey;
|
|
Property ShiftKey : Boolean Index Ord(ssShift) read GetShiftKey;
|
|
end;
|
|
end;
|
|
TFLKeyEvent = TFresnelKeyEvent;
|
|
TFLKeyEvent = TFresnelKeyEvent;
|
|
|
|
+ TFresnelKeyEventClass = class of TFresnelKeyEvent;
|
|
|
|
|
|
{ TFresnelKeyUpEvent }
|
|
{ TFresnelKeyUpEvent }
|
|
|
|
|
|
@@ -506,9 +515,15 @@ end;
|
|
|
|
|
|
constructor TFresnelKeyEvent.Create(const aInit: TFresnelKeyEventInit);
|
|
constructor TFresnelKeyEvent.Create(const aInit: TFresnelKeyEventInit);
|
|
begin
|
|
begin
|
|
|
|
+ Inherited Create(Nil,FresnelEventID);
|
|
FInit:=aInit;
|
|
FInit:=aInit;
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
+function TFresnelKeyEvent.ShiftState: TShiftState;
|
|
|
|
+begin
|
|
|
|
+ Result:=Finit.ShiftState;
|
|
|
|
+end;
|
|
|
|
+
|
|
{ TFresnelMouseEvent }
|
|
{ TFresnelMouseEvent }
|
|
|
|
|
|
function TFresnelMouseEvent.GetShiftKey(AIndex: Integer): Boolean;
|
|
function TFresnelMouseEvent.GetShiftKey(AIndex: Integer): Boolean;
|
|
@@ -666,6 +681,9 @@ begin
|
|
R(TFresnelFocusEvent);
|
|
R(TFresnelFocusEvent);
|
|
R(TFresnelFocusInEvent);
|
|
R(TFresnelFocusInEvent);
|
|
R(TFresnelFocusOutEvent);
|
|
R(TFresnelFocusOutEvent);
|
|
|
|
+ R(TFresnelKeyDownEvent);
|
|
|
|
+ R(TFresnelKeyUpEvent);
|
|
|
|
+// R(TFresnelKeyEvent);
|
|
end;
|
|
end;
|
|
|
|
|
|
class destructor TFresnelEventDispatcher.Done;
|
|
class destructor TFresnelEventDispatcher.Done;
|