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

implement mousewheel support

Browse Source 
git-svn-id: trunk@4941 -
This commit is contained in:
micha 2003-12-23 16:48:32 +00:00
parent 8be99ebec5
commit 6b3b71d99a
1 changed files with 93 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
components/synedit/synedit.pp
View File

@ -84,7 +84,7 @@ const
ScrollBarWidth=0; ScrollBarWidth=0;
{$ENDIF} {$ENDIF}
{$IFNDEF SYN_COMPILER_3_UP} {$IFNDEF SYN_COMPILER_3_UP}
// not defined in all Delphi versions // not defined in all Delphi versions
WM_MOUSEWHEEL = $020A; WM_MOUSEWHEEL = $020A;
{$ENDIF} {$ENDIF}
@ -273,8 +273,9 @@ type
procedure WMImeNotify(var Msg: TMessage); message WM_IME_NOTIFY; procedure WMImeNotify(var Msg: TMessage); message WM_IME_NOTIFY;
{$ENDIF} {$ENDIF}
procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS; procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS;
{$IFNDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
// ToDo mouse wheel procedure WMMouseWheel(var Msg: TLMMouseEvent); message LM_MOUSEWHEEL;
{$ELSE}
procedure WMMouseWheel(var Msg: TMessage); message WM_MOUSEWHEEL; procedure WMMouseWheel(var Msg: TMessage); message WM_MOUSEWHEEL;
{$ENDIF} {$ENDIF}
procedure WMSetCursor(var Msg: TWMSetCursor); message WM_SETCURSOR; procedure WMSetCursor(var Msg: TWMSetCursor); message WM_SETCURSOR;
@ -331,9 +332,7 @@ type
fBookMarkOpt: TSynBookMarkOpt; fBookMarkOpt: TSynBookMarkOpt;
fBorderStyle: TBorderStyle; fBorderStyle: TBorderStyle;
fHideSelection: boolean; fHideSelection: boolean;
{$IFNDEF SYN_LAZARUS}
fMouseWheelAccumulator: integer; fMouseWheelAccumulator: integer;
{$ENDIF}
fOverwriteCaret: TSynEditCaretType; fOverwriteCaret: TSynEditCaretType;
fInsertCaret: TSynEditCaretType; fInsertCaret: TSynEditCaretType;
fCaretOffset: TPoint; fCaretOffset: TPoint;
@ -417,7 +416,7 @@ type
Data: TStream); Data: TStream);
{$ENDIF} {$ENDIF}
function ScanFrom(Index: integer): integer; function ScanFrom(Index: integer): integer;
procedure ScrollTimerHandler(Sender: TObject); procedure ScrollTimerHandler(Sender: TObject);
procedure SelectedColorsChanged(Sender: TObject); procedure SelectedColorsChanged(Sender: TObject);
procedure SetBlockBegin(Value: TPoint); procedure SetBlockBegin(Value: TPoint);
procedure SetBlockEnd(Value: TPoint); procedure SetBlockEnd(Value: TPoint);
@ -514,7 +513,7 @@ type
procedure ListDeleted(Index: integer); procedure ListDeleted(Index: integer);
procedure ListInserted(Index: integer); procedure ListInserted(Index: integer);
procedure ListPutted(Index: integer); procedure ListPutted(Index: integer);
procedure ListScanRanges(Sender: TObject); procedure ListScanRanges(Sender: TObject);
procedure Loaded; override; procedure Loaded; override;
procedure MarkListChange(Sender: TObject); procedure MarkListChange(Sender: TObject);
{$IFDEF SYN_MBCSSUPPORT} {$IFDEF SYN_MBCSSUPPORT}
@ -574,7 +573,7 @@ type
function CaretYPix: Integer; function CaretYPix: Integer;
procedure ClearAll; procedure ClearAll;
procedure ClearBookMark(BookMark: Integer); procedure ClearBookMark(BookMark: Integer);
procedure ClearSelection; procedure ClearSelection;
procedure CommandProcessor(Command: TSynEditorCommand; AChar: char; procedure CommandProcessor(Command: TSynEditorCommand; AChar: char;
Data: pointer); virtual; Data: pointer); virtual;
procedure ClearUndo; procedure ClearUndo;
@ -604,7 +603,7 @@ type
function GetWordAtRowCol(XY: TPoint): string; function GetWordAtRowCol(XY: TPoint): string;
procedure GotoBookMark(BookMark: Integer); procedure GotoBookMark(BookMark: Integer);
function IdentChars: TSynIdentChars; function IdentChars: TSynIdentChars;
procedure InvalidateGutter; procedure InvalidateGutter;
procedure InvalidateLine(Line: integer); procedure InvalidateLine(Line: integer);
function IsBookmark(BookMark: integer): boolean; function IsBookmark(BookMark: integer): boolean;
function LogicalToPhysicalPos(p: TPoint): TPoint; function LogicalToPhysicalPos(p: TPoint): TPoint;
@ -664,7 +663,7 @@ type
property Font: TFont read GetFont write SetFont; property Font: TFont read GetFont write SetFont;
property Highlighter: TSynCustomHighlighter property Highlighter: TSynCustomHighlighter
read fHighlighter write SetHighlighter; read fHighlighter write SetHighlighter;
property LeftChar: Integer read fLeftChar write SetLeftChar; property LeftChar: Integer read fLeftChar write SetLeftChar;
property LineHeight: integer read fTextHeight; property LineHeight: integer read fTextHeight;
property LinesInWindow: Integer read fLinesInWindow; property LinesInWindow: Integer read fLinesInWindow;
property LineText: string read GetLineText write SetLineText; property LineText: string read GetLineText write SetLineText;
@ -674,14 +673,14 @@ type
property Lines: TStrings read fLines write SetLines; property Lines: TStrings read fLines write SetLines;
property Marks: TSynEditMarkList read fMarkList; property Marks: TSynEditMarkList read fMarkList;
property MaxLeftChar: integer read fMaxLeftChar write SetMaxLeftChar property MaxLeftChar: integer read fMaxLeftChar write SetMaxLeftChar
default 1024; default 1024;
property Modified: Boolean read fModified write SetModified; property Modified: Boolean read fModified write SetModified;
property PaintLock: Integer read fPaintLock; property PaintLock: Integer read fPaintLock;
property ReadOnly: Boolean read GetReadOnly write SetReadOnly default FALSE; property ReadOnly: Boolean read GetReadOnly write SetReadOnly default FALSE;
property SelAvail: Boolean read GetSelAvail; property SelAvail: Boolean read GetSelAvail;
property SelText: string read GetSelText write SetSelTextExternal; property SelText: string read GetSelText write SetSelTextExternal;
property Text: string read GetText write SetText; property Text: string read GetText write SetText;
property TopLine: Integer read fTopLine write SetTopLine; property TopLine: Integer read fTopLine write SetTopLine;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure Update; override; procedure Update; override;
procedure Invalidate; override; procedure Invalidate; override;
@ -727,7 +726,7 @@ type
property TabWidth: integer read fTabWidth write SetTabWidth default 8; property TabWidth: integer read fTabWidth write SetTabWidth default 8;
property WantTabs: boolean read fWantTabs write SetWantTabs default FALSE; property WantTabs: boolean read fWantTabs write SetWantTabs default FALSE;
property OnChange: TNotifyEvent read FOnChange write FOnChange; property OnChange: TNotifyEvent read FOnChange write FOnChange;
property OnClearBookmark: TPlaceMarkEvent read fOnClearMark property OnClearBookmark: TPlaceMarkEvent read fOnClearMark
write fOnClearMark; write fOnClearMark;
property OnCommandProcessed: TProcessCommandEvent property OnCommandProcessed: TProcessCommandEvent
read fOnCommandProcessed write fOnCommandProcessed; read fOnCommandProcessed write fOnCommandProcessed;
@ -926,7 +925,7 @@ procedure TCustomSynEdit.AquirePrimarySelection;
var var
FormatList: TClipboardFormat; FormatList: TClipboardFormat;
begin begin
if (not SelAvail) if (not SelAvail)
or (PrimarySelection.OnRequest=@PrimarySelectionRequest) then exit; or (PrimarySelection.OnRequest=@PrimarySelectionRequest) then exit;
FormatList:=CF_TEXT; FormatList:=CF_TEXT;
try try
@ -1122,7 +1121,7 @@ begin
OnDeleted := {$IFDEF FPC}@{$ENDIF}ListDeleted; OnDeleted := {$IFDEF FPC}@{$ENDIF}ListDeleted;
OnInserted := {$IFDEF FPC}@{$ENDIF}ListInserted; OnInserted := {$IFDEF FPC}@{$ENDIF}ListInserted;
OnPutted := {$IFDEF FPC}@{$ENDIF}ListPutted; OnPutted := {$IFDEF FPC}@{$ENDIF}ListPutted;
// OnScanRanges := {$IFDEF FPC}@{$ENDIF}ListScanRanges; // OnScanRanges := {$IFDEF FPC}@{$ENDIF}ListScanRanges;
end; end;
{end} //mh 2000-10-10 {end} //mh 2000-10-10
fFontDummy := TFont.Create; fFontDummy := TFont.Create;
@ -1266,7 +1265,7 @@ begin
fPlugins.Free; fPlugins.Free;
end; end;
{$IFNDEF SYN_LAZARUS} {$IFNDEF SYN_LAZARUS}
fScrollTimer.Free; fScrollTimer.Free;
fTSearch.Free; fTSearch.Free;
fMarkList.Free; fMarkList.Free;
fBookMarkOpt.Free; fBookMarkOpt.Free;
@ -1344,7 +1343,7 @@ end;
function TCustomSynEdit.GetLineText: string; function TCustomSynEdit.GetLineText: string;
begin begin
if (CaretY >= 1) and (CaretY <= Lines.Count) then if (CaretY >= 1) and (CaretY <= Lines.Count) then
Result := Lines[CaretY - 1] Result := Lines[CaretY - 1]
else else
Result := ''; Result := '';
@ -1417,7 +1416,7 @@ function TCustomSynEdit.GetSelText: string;
FillChar(P^, Len, #$20); FillChar(P^, Len, #$20);
Inc(P, Len); Inc(P, Len);
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
var var
sLineBreak: string; sLineBreak: string;
@ -1885,7 +1884,7 @@ begin
//if mousedown occured in selected block then begin drag operation //if mousedown occured in selected block then begin drag operation
Exclude(fStateFlags, sfWaitForDragging); Exclude(fStateFlags, sfWaitForDragging);
if bWasSel and (eoDragDropEditing in fOptions) and (X >= fGutterWidth + 2) if bWasSel and (eoDragDropEditing in fOptions) and (X >= fGutterWidth + 2)
and (SelectionMode = smNormal) and IsPointInSelection(CaretXY) and (SelectionMode = smNormal) and IsPointInSelection(CaretXY)
then then
bStartDrag := TRUE; bStartDrag := TRUE;
end; end;
@ -1975,7 +1974,7 @@ begin
//writeln(' TCustomSynEdit.MouseMove CAPTURE Mouse=',X,',',Y,' Caret=',CaretX,',',CaretY,', BlockBegin=',BlockBegin.X,',',BlockBegin.Y,' BlockEnd=',BlockEnd.X,',',BlockEnd.Y,' Client=',ClientWidth-ScrollBarWidth,',',ClientHeight-ScrollBarWidth); //writeln(' TCustomSynEdit.MouseMove CAPTURE Mouse=',X,',',Y,' Caret=',CaretX,',',CaretY,', BlockBegin=',BlockBegin.X,',',BlockBegin.Y,' BlockEnd=',BlockEnd.X,',',BlockEnd.Y,' Client=',ClientWidth-ScrollBarWidth,',',ClientHeight-ScrollBarWidth);
if (X >= fGutterWidth) if (X >= fGutterWidth)
and (X < ClientWidth{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF}) and (X < ClientWidth{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF})
and (Y >= 0) and (Y >= 0)
and (Y < ClientHeight{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF}) and (Y < ClientHeight{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF})
then then
ComputeCaret(X, Y); ComputeCaret(X, Y);
@ -2123,7 +2122,7 @@ begin
SetBlockEnd(CaretXY); SetBlockEnd(CaretXY);
Exclude(fStateFlags, sfWaitForDragging); Exclude(fStateFlags, sfWaitForDragging);
end; end;
if (Button=mbLeft) if (Button=mbLeft)
and (fStateFlags * [sfWaitForDragging] = []) then and (fStateFlags * [sfWaitForDragging] = []) then
begin begin
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
@ -2205,7 +2204,7 @@ begin
rcDraw.Left := Max(rcDraw.Left, fGutterWidth); rcDraw.Left := Max(rcDraw.Left, fGutterWidth);
PaintTextLines(rcDraw, nL1, nL2, nC1, nC2); PaintTextLines(rcDraw, nL1, nL2, nC1, nC2);
end; end;
PluginsAfterPaint(Canvas, rcDraw, nL1, nL2); PluginsAfterPaint(Canvas, rcDraw, nL1, nL2);
// If there is a custom paint handler call it. // If there is a custom paint handler call it.
DoOnPaint; DoOnPaint;
finally finally
@ -2378,7 +2377,7 @@ var
bSpecialLine, bLineSelected: boolean; bSpecialLine, bLineSelected: boolean;
colFG, colBG: TColor; colFG, colBG: TColor;
colSelFG, colSelBG: TColor; colSelFG, colSelBG: TColor;
colEditorBG: TColor; colEditorBG: TColor;
// info about selection of the current line // info about selection of the current line
nSelStart, nSelEnd: integer; nSelStart, nSelEnd: integer;
bComplexLine: boolean; bComplexLine: boolean;
@ -2404,7 +2403,7 @@ var
procedure ComputeSelectionInfo; procedure ComputeSelectionInfo;
var var
p: TPoint; p: TPoint;
begin begin
bAnySelection := FALSE; bAnySelection := FALSE;
// Only if selection is visible anyway. // Only if selection is visible anyway.
@ -2698,7 +2697,7 @@ var
TokenAccu.Style := Style; TokenAccu.Style := Style;
end; end;
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure DrawHilightBracketToken(attr: TSynHighlighterAttributes; procedure DrawHilightBracketToken(attr: TSynHighlighterAttributes;
sToken: PChar; nLine, nTokenPos, nTokenLen: integer); sToken: PChar; nLine, nTokenPos, nTokenLen: integer);
@ -2706,7 +2705,7 @@ var
var var
BracketFGCol, BracketBGCol: TColor; BracketFGCol, BracketBGCol: TColor;
BracketStyle, TokenStyle: TFontStyles; BracketStyle, TokenStyle: TFontStyles;
procedure PaintSubToken(SubTokenLen: integer; Hilight: boolean); procedure PaintSubToken(SubTokenLen: integer; Hilight: boolean);
begin begin
if SubTokenLen=0 then exit; if SubTokenLen=0 then exit;
@ -2720,7 +2719,7 @@ var
dec(nTokenLen,SubTokenLen); dec(nTokenLen,SubTokenLen);
inc(nTokenPos,SubTokenLen); inc(nTokenPos,SubTokenLen);
end; end;
var var
LeftBracketX, RightBracketX, Dummy: integer; LeftBracketX, RightBracketX, Dummy: integer;
begin begin
@ -2811,7 +2810,7 @@ var
if Abs(NewBlue-fBlue)<128 then if Abs(NewBlue-fBlue)<128 then
NewBlue:=(255-fBlue) and $ff; NewBlue:=(255-fBlue) and $ff;
LinkFGCol:=NewRed+(NewGreen shl 8)+(NewBlue shl 16); LinkFGCol:=NewRed+(NewGreen shl 8)+(NewBlue shl 16);
AddHighlightToken(sToken, nTokenPos, nTokenLen, AddHighlightToken(sToken, nTokenPos, nTokenLen,
LinkFGCol, LinkBGCol, LinkStyle); LinkFGCol, LinkBGCol, LinkStyle);
end; end;
@ -3005,7 +3004,7 @@ var
{$ENDIF} {$ENDIF}
end; end;
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure InitializeHighlightBrackets; procedure InitializeHighlightBrackets;
// test if caret over bracket and search anti bracket // test if caret over bracket and search anti bracket
@ -3092,7 +3091,7 @@ var
end; end;
end; end;
end; end;
procedure CalculateCtrlMouseLink; procedure CalculateCtrlMouseLink;
begin begin
fLastCtrlMouseLinkY:=-1; fLastCtrlMouseLinkY:=-1;
@ -3109,7 +3108,7 @@ var
fLastCtrlMouseLinkY:=fLastMouseCaret.Y; fLastCtrlMouseLinkY:=fLastMouseCaret.Y;
LinkFGCol:=clBlue; LinkFGCol:=clBlue;
end; end;
procedure PaintCtrlMouseLinkLine; procedure PaintCtrlMouseLinkLine;
var var
LineLeft, LineTop, LineRight: integer; LineLeft, LineTop, LineRight: integer;
@ -3195,7 +3194,7 @@ begin
{$ENDIF} {$ENDIF}
end; end;
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
PaintCtrlMouseLinkLine; PaintCtrlMouseLinkLine;
{$ENDIF} {$ENDIF}
@ -3595,7 +3594,7 @@ end;
procedure TCustomSynEdit.SetLineText(Value: string); procedure TCustomSynEdit.SetLineText(Value: string);
begin begin
if (CaretY >= 1) and (CaretY <= Max(1, Lines.Count)) then if (CaretY >= 1) and (CaretY <= Max(1, Lines.Count)) then
Lines[CaretY - 1] := Value; Lines[CaretY - 1] := Value;
end; end;
@ -3696,7 +3695,7 @@ var
MBCSGetSelRangeInLineWhenColumnSelectionMode(TempString, l, r); MBCSGetSelRangeInLineWhenColumnSelectionMode(TempString, l, r);
Delete(TempString, l, r - l); Delete(TempString, l, r - l);
{$ENDIF} {$ENDIF}
TrimmedSetLine(x, TempString); TrimmedSetLine(x, TempString);
end; end;
// Lines never get deleted completely, so keep caret at end. // Lines never get deleted completely, so keep caret at end.
CaretXY := Point(BB.X, fBlockEnd.Y); CaretXY := Point(BB.X, fBlockEnd.Y);
@ -4013,9 +4012,9 @@ begin
Exclude(fStateFlags, sfCaretChanged); Exclude(fStateFlags, sfCaretChanged);
CX := CaretXPix + FCaretOffset.X; CX := CaretXPix + FCaretOffset.X;
CY := CaretYPix + FCaretOffset.Y; CY := CaretYPix + FCaretOffset.Y;
if (CX >= fGutterWidth) if (CX >= fGutterWidth)
and (CX < ClientWidth{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF}) and (CX < ClientWidth{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF})
and (CY >= 0) and (CY >= 0)
and (CY < ClientHeight{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF}) and (CY < ClientHeight{$IFDEF SYN_LAZARUS}-ScrollBarWidth{$ENDIF})
then begin then begin
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
@ -4087,7 +4086,7 @@ begin
end; end;
if fScrollBars in [ssBoth, ssVertical] then begin if fScrollBars in [ssBoth, ssVertical] then begin
nMaxScroll := Lines.Count{$IFDEF SYN_LAZARUS}+1{$ENDIF}; nMaxScroll := Lines.Count{$IFDEF SYN_LAZARUS}+1{$ENDIF};
if (eoScrollPastEof in Options) then if (eoScrollPastEof in Options) then
Inc(nMaxScroll, LinesInWindow - 1); Inc(nMaxScroll, LinesInWindow - 1);
if nMaxScroll <= MAX_SCROLL then begin if nMaxScroll <= MAX_SCROLL then begin
ScrollInfo.nMax := Max(1, nMaxScroll); ScrollInfo.nMax := Max(1, nMaxScroll);
@ -4429,7 +4428,7 @@ begin
ScanFrom(0); ScanFrom(0);
end; end;
InvalidateLines(Index + 1, TopLine + LinesInWindow); InvalidateLines(Index + 1, TopLine + LinesInWindow);
InvalidateGutterLines(Index + 1, TopLine + LinesInWindow); InvalidateGutterLines(Index + 1, TopLine + LinesInWindow);
end; end;
procedure TCustomSynEdit.ListPutted(Index: Integer); procedure TCustomSynEdit.ListPutted(Index: Integer);
@ -4882,7 +4881,7 @@ begin
and (ItemNext.fChangeReason = crDragDropInsert)) and (ItemNext.fChangeReason = crDragDropInsert))
then then
Redo; Redo;
*) *)
{end} //mh 2000-11-20 {end} //mh 2000-11-20
end; end;
crLineBreak: crLineBreak:
@ -5023,7 +5022,7 @@ begin
then then
Undo; Undo;
*) *)
{end} //mh 2000-11-20 {end} //mh 2000-11-20
end; end;
crDeleteAfterCursor, crDelete, {crDragDropDelete, crSelDelete, } //mh 2000-11-20 crDeleteAfterCursor, crDelete, {crDragDropDelete, crSelDelete, } //mh 2000-11-20
crSilentDelete, crSilentDeleteAfterCursor: //mh 2000-10-30 crSilentDelete, crSilentDeleteAfterCursor: //mh 2000-10-30
@ -5079,7 +5078,7 @@ begin
Lines.Delete(Item.fChangeEndPos.y); Lines.Delete(Item.fChangeEndPos.y);
end; end;
CaretXY := Item.fChangeStartPos; CaretXY := Item.fChangeStartPos;
TrimmedSetLine(CaretY - 1, TmpStr + Item.fChangeStr); TrimmedSetLine(CaretY - 1, TmpStr + Item.fChangeStr);
DoLinesDeleted(CaretY, 1); DoLinesDeleted(CaretY, 1);
end; end;
crIndent: // remove the column that was inserted crIndent: // remove the column that was inserted
@ -5413,7 +5412,7 @@ begin
if (fBookmarkOpt <> nil) then if (fBookmarkOpt <> nil) then
if (AComponent = fBookmarkOpt.BookmarkImages) then begin if (AComponent = fBookmarkOpt.BookmarkImages) then begin
fBookmarkOpt.BookmarkImages := nil; fBookmarkOpt.BookmarkImages := nil;
InvalidateGutterLines(-1, -1); InvalidateGutterLines(-1, -1);
end; end;
end; end;
end; end;
@ -5709,7 +5708,7 @@ var
s: string; s: string;
{$ENDIF} {$ENDIF}
counter: Integer; counter: Integer;
InsDelta: integer; InsDelta: integer;
{begin} //mh 2000-10-30 {begin} //mh 2000-10-30
procedure SetSelectedTextEmpty; procedure SetSelectedTextEmpty;
@ -5783,7 +5782,7 @@ begin
Dec(counter); Dec(counter);
if (Command in [ecPageUp, ecSelPageUp]) then if (Command in [ecPageUp, ecSelPageUp]) then
counter := -counter; counter := -counter;
TopLine := TopLine + counter; TopLine := TopLine + counter;
MoveCaretVert(counter, Command in [ecSelPageUp, ecSelPageDown]); MoveCaretVert(counter, Command in [ecSelPageUp, ecSelPageDown]);
Update; Update;
end; end;
@ -6098,7 +6097,7 @@ begin
{end} //mh 2000-10-06 {end} //mh 2000-10-06
end; end;
end else begin end else begin
if fLines.Count = 0 then if fLines.Count = 0 then
fLines.Add(''); fLines.Add('');
BackCounter := CaretY - 1; BackCounter := CaretY - 1;
while BackCounter >= 0 do begin while BackCounter >= 0 do begin
@ -6113,7 +6112,7 @@ begin
if Command = ecLineBreak then if Command = ecLineBreak then
CaretY := CaretY + 1; CaretY := CaretY + 1;
end; end;
DoLinesInserted(CaretY - InsDelta, 1); DoLinesInserted(CaretY - InsDelta, 1);
EnsureCursorPosVisible; //JGF 2000-09-23 EnsureCursorPosVisible; //JGF 2000-09-23
fLastCaretX := fCaretX; //mh 2000-10-19 fLastCaretX := fCaretX; //mh 2000-10-19
end; end;
@ -6371,7 +6370,7 @@ var
CurIdentChars, WhiteChars: TSynIdentChars; CurIdentChars, WhiteChars: TSynIdentChars;
nTokenPos, nTokenLen: integer; nTokenPos, nTokenLen: integer;
sToken: PChar; sToken: PChar;
procedure FindFirstNonWhiteSpaceCharInNextLine; procedure FindFirstNonWhiteSpaceCharInNextLine;
begin begin
if CY < Lines.Count then begin if CY < Lines.Count then begin
@ -6383,7 +6382,7 @@ var
if CX>LineLen then CX:=1; if CX>LineLen then CX:=1;
end; end;
end; end;
begin begin
CX := CaretX; CX := CaretX;
CY := CaretY; CY := CaretY;
@ -6557,7 +6556,7 @@ end;
{ Called by FMarkList if change } { Called by FMarkList if change }
procedure TCustomSynEdit.MarkListChange(Sender: TObject); procedure TCustomSynEdit.MarkListChange(Sender: TObject);
begin begin
InvalidateGutter; InvalidateGutter;
end; end;
procedure TCustomSynEdit.SetSelWord; procedure TCustomSynEdit.SetSelWord;
@ -6647,11 +6646,11 @@ var
nW: integer; nW: integer;
begin begin
if not (csLoading in ComponentState) then begin if not (csLoading in ComponentState) then begin
if fGutter.ShowLineNumbers and fGutter.AutoSize then if fGutter.ShowLineNumbers and fGutter.AutoSize then
fGutter.AutoSizeDigitCount(Lines.Count); fGutter.AutoSizeDigitCount(Lines.Count);
nW := fGutter.RealGutterWidth(fCharWidth); nW := fGutter.RealGutterWidth(fCharWidth);
if nW = fGutterWidth then if nW = fGutterWidth then
InvalidateGutter InvalidateGutter
else else
SetGutterWidth(nW); SetGutterWidth(nW);
end; end;
@ -6669,7 +6668,36 @@ begin
fRedoList.Unlock; fRedoList.Unlock;
end; end;
{$IFNDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TCustomSynEdit.WMMouseWheel(var Msg: TLMMouseEvent);
var
nDelta: integer;
nWheelClicks: integer;
const
LinesToScroll = 3;
WHEEL_DELTA = 120;
WHEEL_PAGESCROLL = $FFFFFFFF;
begin
if csDesigning in ComponentState then
exit;
if GetKeyState(VK_CONTROL) >= 0 then
nDelta := LinesToScroll
else
nDelta := LinesInWindow shr Ord(eoHalfPageScroll in fOptions);
Inc(fMouseWheelAccumulator, Msg.WheelDelta);
nWheelClicks := fMouseWheelAccumulator div WHEEL_DELTA;
fMouseWheelAccumulator := fMouseWheelAccumulator mod WHEEL_DELTA;
if (nDelta = integer(WHEEL_PAGESCROLL)) or (nDelta > LinesInWindow) then
nDelta := LinesInWindow;
TopLine := TopLine - (nDelta * nWheelClicks);
Update;
end;
{$ELSE}
procedure TCustomSynEdit.WMMouseWheel(var Msg: TMessage); procedure TCustomSynEdit.WMMouseWheel(var Msg: TMessage);
var var
nDelta: integer; nDelta: integer;
@ -6701,6 +6729,7 @@ begin
TopLine := TopLine - (nDelta * nWheelClicks); TopLine := TopLine - (nDelta * nWheelClicks);
Update; Update;
end; end;
{$ENDIF} {$ENDIF}
procedure TCustomSynEdit.SetWantTabs(const Value: boolean); procedure TCustomSynEdit.SetWantTabs(const Value: boolean);
@ -6855,7 +6884,7 @@ begin
// fix the caret position and the remaining results // fix the caret position and the remaining results
if not bBackward then begin if not bBackward then begin
CaretX := nFound + nReplaceLen; CaretX := nFound + nReplaceLen;
if (nSearchLen <> nReplaceLen) and (nAction <> raSkip) then if (nSearchLen <> nReplaceLen) and (nAction <> raSkip) then
fTSearch.FixResults(nFound, nSearchLen - nReplaceLen); fTSearch.FixResults(nFound, nSearchLen - nReplaceLen);
end; end;
if not bReplaceAll then if not bReplaceAll then
@ -6948,7 +6977,7 @@ end;
procedure TCustomSynEdit.BookMarkOptionsChanged(Sender: TObject); procedure TCustomSynEdit.BookMarkOptionsChanged(Sender: TObject);
begin begin
InvalidateGutter; InvalidateGutter;
end; end;
procedure TCustomSynEdit.SetOptions(Value: TSynEditorOptions); procedure TCustomSynEdit.SetOptions(Value: TSynEditorOptions);
@ -7544,7 +7573,7 @@ end;
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
procedure TCustomSynEdit.SetModified(Value: boolean); procedure TCustomSynEdit.SetModified(Value: boolean);
begin begin
if Value <> fModified then begin if Value <> fModified then begin
fModified := Value; fModified := Value;
@ -7784,7 +7813,7 @@ var
until FALSE; until FALSE;
end; end;
end; end;
procedure DoCheckBracket; procedure DoCheckBracket;
var var
i: integer; i: integer;
@ -7802,11 +7831,11 @@ var
end; end;
end; end;
end; end;
begin begin
Result.X:=-1; Result.X:=-1;
Result.Y:=-1; Result.Y:=-1;
// get char at caret // get char at caret
LogicalStart:=PhysicalToLogicalPos(StartBracket); LogicalStart:=PhysicalToLogicalPos(StartBracket);
PosX := LogicalStart.X; PosX := LogicalStart.X;
@ -8159,7 +8188,7 @@ end;
procedure TCustomSynEdit.PluginsAfterPaint(ACanvas: TCanvas; AClip: TRect; procedure TCustomSynEdit.PluginsAfterPaint(ACanvas: TCanvas; AClip: TRect;
FirstLine, LastLine: integer); FirstLine, LastLine: integer);
var var
i: integer; i: integer;
begin begin
if fPlugins <> nil then if fPlugins <> nil then
for i := 0 to fPlugins.Count - 1 do begin for i := 0 to fPlugins.Count - 1 do begin
@ -8180,7 +8209,7 @@ begin
end; end;
{$ENDIF} {$ENDIF}
procedure TCustomSynEdit.TrimmedSetLine(ALine: integer; ALineText: string); procedure TCustomSynEdit.TrimmedSetLine(ALine: integer; ALineText: string);
begin begin
if eoTrimTrailingSpaces in Options then if eoTrimTrailingSpaces in Options then
Lines[ALine] := TrimRight(ALineText) Lines[ALine] := TrimRight(ALineText)
@ -8222,16 +8251,16 @@ procedure TSynEditMark.SetInternalImage(const Value: boolean);
begin begin
fInternalImage := Value; fInternalImage := Value;
if fVisible and Assigned(fEdit) then if fVisible and Assigned(fEdit) then
fEdit.InvalidateGutterLines(fLine, fLine); fEdit.InvalidateGutterLines(fLine, fLine);
end; end;
procedure TSynEditMark.SetLine(const Value: Integer); procedure TSynEditMark.SetLine(const Value: Integer);
begin begin
if fVisible and Assigned(fEdit) then begin if fVisible and Assigned(fEdit) then begin
if fLine > 0 then if fLine > 0 then
fEdit.InvalidateGutterLines(fLine, fLine); fEdit.InvalidateGutterLines(fLine, fLine);
fLine := Value; fLine := Value;
fEdit.InvalidateGutterLines(fLine, fLine); fEdit.InvalidateGutterLines(fLine, fLine);
end else end else
fLine := Value; fLine := Value;
end; end;
@ -8241,7 +8270,7 @@ begin
if fVisible <> Value then begin if fVisible <> Value then begin
fVisible := Value; fVisible := Value;
if Assigned(fEdit) then if Assigned(fEdit) then
fEdit.InvalidateGutterLines(fLine, fLine); fEdit.InvalidateGutterLines(fLine, fLine);
end; end;
end; end;