From 4f22f1677698d4114b76c1ddb4216f48892c8d9c Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Wed, 17 Apr 2013 10:31:14 +0100 Subject: Revert "Add common procedures in fpg_base for deadkeys" This reverts commit ccfd4b2ae0a9dfae0d19ae7ba673118af70c75da. --- src/gui/fpg_memo.pas | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'src/gui/fpg_memo.pas') diff --git a/src/gui/fpg_memo.pas b/src/gui/fpg_memo.pas index 2769e4d4..c0b227ae 100644 --- a/src/gui/fpg_memo.pas +++ b/src/gui/fpg_memo.pas @@ -1064,7 +1064,34 @@ begin prevval := Text; if FDeadKeyChar> -1 then begin - AText:= UseDeadKey(AText, FDeadKeyChar); + case FDeadKeyChar of + keyDeadDiaeresis: + case AText of + 'a': + AText:= 'â'; + 'e': + AText:= 'ë'; + 'i': + AText:= 'ï'; + 'o': + AText:= 'ö'; + 'u': + AText:= 'ü'; + end; + keyDeadCircumflex: + case AText of + 'a': + AText:= 'â'; + 'e': + AText:= 'ê'; + 'i': + AText:= 'î'; + 'o': + AText:= 'ô'; + 'u': + AText:= 'û'; + end; + end; FDeadKeyChar:= -1; end; s := AText; @@ -1115,8 +1142,8 @@ begin Consumed := True; hasChanged := False; - if FDeadKeyChar = -1 then - FDeadKeyChar:= ReadDeadKey(keycode); + if (keycode= 58536) or (keycode= 58462) then + FDeadKeyChar:= keycode; case CheckClipBoardKey(keycode, shiftstate) of ckCopy: -- cgit v1.2.3-70-g09d2 From 4bb0fed12993ab26e6e4a61e481f8e405551c92e Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Wed, 17 Apr 2013 10:31:17 +0100 Subject: Revert "Use dead key codes for special accentuated characters" This reverts commit 5ee5b79db4825a3b2afa03dde72ddbe7e46b3c47. --- src/gui/fpg_edit.pas | 18 +++++++++--------- src/gui/fpg_editcombo.pas | 16 ++++++++-------- src/gui/fpg_memo.pas | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/gui/fpg_memo.pas') diff --git a/src/gui/fpg_edit.pas b/src/gui/fpg_edit.pas index 01c52d4c..c462f06e 100644 --- a/src/gui/fpg_edit.pas +++ b/src/gui/fpg_edit.pas @@ -94,7 +94,7 @@ type FVisibleText: TfpgString; FVisSelStartPx: integer; FVisSelEndPx: integer; - FDeadKeyChar: integer; + FSpecialChar: integer; function GetMarginAdjustment: integer; virtual; procedure DrawSelection; virtual; procedure DoOnChange; virtual; @@ -756,10 +756,10 @@ var prevval: string; begin prevval := Text; - if FDeadKeyChar> -1 then + if FSpecialChar> -1 then begin - case FDeadKeyChar of - keyDeadDiaeresis: + case FSpecialChar of + 58536: case AText of 'a': AText:= 'â'; @@ -772,7 +772,7 @@ begin 'u': AText:= 'ü'; end; - keyDeadCircumflex: + 58462: case AText of 'a': AText:= 'â'; @@ -786,7 +786,7 @@ begin AText:= 'û'; end; end; - FDeadKeyChar:= -1; + FSpecialChar:= -1; end; s := AText; @@ -831,8 +831,8 @@ begin hasChanged := False; fpgApplication.HideHint; - if (keycode= keyDeadCircumflex) or (keycode= keyDeadDiaeresis) then - FDeadKeyChar:= keycode; + if (keycode= 58536) or (keycode= 58462) then + FSpecialChar:= keycode; Consumed := True; case CheckClipBoardKey(keycode, shiftstate) of @@ -1106,7 +1106,7 @@ begin FPopupMenu := nil; FDefaultPopupMenu := nil; FOnChange := nil; - FDeadKeyChar := -1; + FSpecialChar := -1; end; destructor TfpgBaseEdit.Destroy; diff --git a/src/gui/fpg_editcombo.pas b/src/gui/fpg_editcombo.pas index 72b804ef..311d452f 100644 --- a/src/gui/fpg_editcombo.pas +++ b/src/gui/fpg_editcombo.pas @@ -87,7 +87,7 @@ type FSelStart: integer; FSelOffset: integer; FCursorPos: integer; - FDeadKeyChar: integer; + FSpecialChar: integer; procedure DoDropDown; override; function GetText: string; virtual; function HasText: boolean; virtual; @@ -524,10 +524,10 @@ var i: integer; begin prevval := FText; - if FDeadKeyChar> -1 then + if FSpecialChar> -1 then begin - case FDeadKeyChar of - keyDeadDiaeresis: + case FSpecialChar of + 58536: case AText of 'a': AText:= 'â'; @@ -540,7 +540,7 @@ begin 'u': AText:= 'ü'; end; - keyDeadCircumflex: + 58462: case AText of 'a': AText:= 'â'; @@ -554,7 +554,7 @@ begin AText:= 'û'; end; end; - FDeadKeyChar:= -1; + FSpecialChar:= -1; end; s := AText; consumed := False; @@ -618,7 +618,7 @@ begin hasChanged := False; if (keycode= 58536) or (keycode= 58462) then - FDeadKeyChar:= keycode; + FSpecialChar:= keycode; if not Enabled then consumed := False @@ -919,7 +919,7 @@ begin FDrawOffset := 0; FSelectedItem := -1; // to allow typing if list is empty FNewItem := False; - FDeadKeyChar := -1; + FSpecialChar := -1; CalculateInternalButtonRect; end; diff --git a/src/gui/fpg_memo.pas b/src/gui/fpg_memo.pas index c0b227ae..71bcee56 100644 --- a/src/gui/fpg_memo.pas +++ b/src/gui/fpg_memo.pas @@ -98,7 +98,7 @@ type function GetSelectionText: TfpgString; procedure SetSelectionText(const AText: TfpgString); protected - FDeadKeyChar: integer; + FSpecialChar: integer; procedure HandleKeyChar(var AText: TfpgChar; var shiftstate: TShiftState; var consumed: boolean); override; procedure HandleKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: boolean); override; procedure HandleLMouseDown(x, y: integer; shiftstate: TShiftState); override; @@ -480,7 +480,7 @@ begin FReadOnly := False; FUpdateCount := 0; FBorderStyle := ebsDefault; - FDeadKeyChar := -1; + FSpecialChar := -1; FLines := TfpgMemoStrings.Create(self); FFirstLine := 0; @@ -1062,10 +1062,10 @@ var begin inherited; prevval := Text; - if FDeadKeyChar> -1 then + if FSpecialChar> -1 then begin - case FDeadKeyChar of - keyDeadDiaeresis: + case FSpecialChar of + 58536: case AText of 'a': AText:= 'â'; @@ -1078,7 +1078,7 @@ begin 'u': AText:= 'ü'; end; - keyDeadCircumflex: + 58462: case AText of 'a': AText:= 'â'; @@ -1092,7 +1092,7 @@ begin AText:= 'û'; end; end; - FDeadKeyChar:= -1; + FSpecialChar:= -1; end; s := AText; @@ -1143,7 +1143,7 @@ begin hasChanged := False; if (keycode= 58536) or (keycode= 58462) then - FDeadKeyChar:= keycode; + FSpecialChar:= keycode; case CheckClipBoardKey(keycode, shiftstate) of ckCopy: -- cgit v1.2.3-70-g09d2 From d305eb02807d90d94b3f0edac509e270ac582b7c Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Wed, 17 Apr 2013 10:31:18 +0100 Subject: Revert "Make special characters known by memo component" This reverts commit d71020bc89474bb98aa49b62b769de2d6b20ca8d. --- src/gui/fpg_memo.pas | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'src/gui/fpg_memo.pas') diff --git a/src/gui/fpg_memo.pas b/src/gui/fpg_memo.pas index 71bcee56..df16367b 100644 --- a/src/gui/fpg_memo.pas +++ b/src/gui/fpg_memo.pas @@ -98,7 +98,6 @@ type function GetSelectionText: TfpgString; procedure SetSelectionText(const AText: TfpgString); protected - FSpecialChar: integer; procedure HandleKeyChar(var AText: TfpgChar; var shiftstate: TShiftState; var consumed: boolean); override; procedure HandleKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: boolean); override; procedure HandleLMouseDown(x, y: integer; shiftstate: TShiftState); override; @@ -480,7 +479,6 @@ begin FReadOnly := False; FUpdateCount := 0; FBorderStyle := ebsDefault; - FSpecialChar := -1; FLines := TfpgMemoStrings.Create(self); FFirstLine := 0; @@ -1062,38 +1060,6 @@ var begin inherited; prevval := Text; - if FSpecialChar> -1 then - begin - case FSpecialChar of - 58536: - case AText of - 'a': - AText:= 'â'; - 'e': - AText:= 'ë'; - 'i': - AText:= 'ï'; - 'o': - AText:= 'ö'; - 'u': - AText:= 'ü'; - end; - 58462: - case AText of - 'a': - AText:= 'â'; - 'e': - AText:= 'ê'; - 'i': - AText:= 'î'; - 'o': - AText:= 'ô'; - 'u': - AText:= 'û'; - end; - end; - FSpecialChar:= -1; - end; s := AText; if (not consumed) and (not ReadOnly) then @@ -1141,10 +1107,6 @@ begin fpgApplication.HideHint; Consumed := True; hasChanged := False; - - if (keycode= 58536) or (keycode= 58462) then - FSpecialChar:= keycode; - case CheckClipBoardKey(keycode, shiftstate) of ckCopy: begin -- cgit v1.2.3-70-g09d2