paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-24 05:58:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

* attempt to fix webbugs 2346-2348

Browse Source
This commit is contained in:
pierre 2003-01-29 00:29:14 +00:00
parent 65ff95d545
commit e5afeb668f
1 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ide/weditor.pas
View File

@ -535,7 +535,8 @@ type
{a}function GetErrorMessage: string; virtual; {a}function GetErrorMessage: string; virtual;
{a}procedure SetErrorMessage(const S: string); virtual; {a}procedure SetErrorMessage(const S: string); virtual;
{a}procedure AdjustSelection(DeltaX, DeltaY: sw_integer); {a}procedure AdjustSelection(DeltaX, DeltaY: sw_integer);
{a}procedure AdjustSelectionPos(CurPosX, CurPosY: sw_integer; DeltaX, DeltaY: sw_integer); {a}procedure AdjustSelectionBefore(DeltaX, DeltaY: sw_integer);
{a}procedure AdjustSelectionPos(OldCurPosX, OldCurPosY: sw_integer; DeltaX, DeltaY: sw_integer);
{a}procedure GetContent(ALines: PUnsortedStringCollection); virtual; {a}procedure GetContent(ALines: PUnsortedStringCollection); virtual;
{a}procedure SetContent(ALines: PUnsortedStringCollection); virtual; {a}procedure SetContent(ALines: PUnsortedStringCollection); virtual;
{a}function LoadFromStream(Stream: PFastBufStream): boolean; virtual; {a}function LoadFromStream(Stream: PFastBufStream): boolean; virtual;
@ -2631,26 +2632,30 @@ begin
{ Abstract } { Abstract }
end; end;
procedure TCustomCodeEditor.AdjustSelectionPos(CurPosX, CurPosY: sw_integer; DeltaX, DeltaY: sw_integer); procedure TCustomCodeEditor.AdjustSelectionPos(OldCurPosX, OldCurPosY: sw_integer; DeltaX, DeltaY: sw_integer);
var CP: TPoint; var CP: TPoint;
begin begin
if ValidBlock=false then Exit; if ValidBlock=false then Exit;
CP.X:=CurPosX; CP.Y:=CurPosY; CP.X:=OldCurPosX; CP.Y:=OldCurPosY;
if (PosToOfsP(SelStart)<=PosToOfsP(CP)) and (PosToOfsP(CP)<PosToOfsP(SelEnd)) then if (PosToOfsP(SelStart)<=PosToOfsP(CP)) and (PosToOfsP(CP)<PosToOfsP(SelEnd)) then
begin begin
{ CurPos is IN selection } { OldCurPos is IN selection }
Inc(SelEnd.Y,DeltaY); if (CP.Y=SelEnd.Y) then
if (CP.Y=SelEnd.Y) and begin
((SelStart.Y<>SelEnd.Y) or (SelStart.X<=CP.X)) and if ((SelStart.Y<>SelEnd.Y) or (SelStart.X<=CP.X)) and
(CP.X<=SelEnd.X) then (CP.X<=SelEnd.X) then
Inc(SelEnd.X,DeltaX); Inc(SelEnd.X,DeltaX);
end
else if (CP.Y=SelEnd.Y+DeltaY) then
Inc(SelEnd.X,DeltaX);
Inc(SelEnd.Y,DeltaY);
SelectionChanged; SelectionChanged;
end end
else else
if (PosToOfsP(CP)<=PosToOfsP(SelStart)) then if (PosToOfsP(CP)<=PosToOfsP(SelStart)) then
begin begin
{ CurPos is BEFORE selection } { OldCurPos is BEFORE selection }
if (CP.Y=SelStart.Y) and (CP.Y=SelEnd.Y) and (DeltaY<0) then if (CP.Y=SelStart.Y) and (CP.Y=SelEnd.Y) and (DeltaY<0) then
begin begin
SelStart:=CurPos; SelEnd:=CurPos; SelStart:=CurPos; SelEnd:=CurPos;
@ -2671,7 +2676,7 @@ begin
end end
else else
begin begin
{ CurPos is AFTER selection } { OldCurPos is AFTER selection }
{ actually we don't have to do anything here } { actually we don't have to do anything here }
end; end;
end; end;
@ -3235,7 +3240,16 @@ begin
DrawView; DrawView;
end; end;
{ to be called if CurPos has already been changed }
procedure TCustomCodeEditor.AdjustSelection(DeltaX, DeltaY: sw_integer); procedure TCustomCodeEditor.AdjustSelection(DeltaX, DeltaY: sw_integer);
begin
AdjustSelectionPos(CurPos.X-DeltaX,CurPos.Y-DeltaY,DeltaX,DeltaY);
end;
{ to be called if CurPos has not yet been changed }
procedure TCustomCodeEditor.AdjustSelectionBefore(DeltaX, DeltaY: sw_integer);
begin begin
AdjustSelectionPos(CurPos.X,CurPos.Y,DeltaX,DeltaY); AdjustSelectionPos(CurPos.X,CurPos.Y,DeltaX,DeltaY);
end; end;
@ -4829,14 +4843,14 @@ begin
{ obsolete IndentStr is taken care of by the Flags PM } { obsolete IndentStr is taken care of by the Flags PM }
Addaction(eaInsertLine,SCP,CurPos,CharStr(' ',i-1){IndentStr},GetFlags); Addaction(eaInsertLine,SCP,CurPos,CharStr(' ',i-1){IndentStr},GetFlags);
SetStoreUndo(false); SetStoreUndo(false);
AdjustSelection(CurPos.X-SCP.X,CurPos.Y-SCP.Y); AdjustSelectionPos(SCP.X,SCP.Y,CurPos.X-SCP.X,CurPos.Y-SCP.Y);
end else end else
begin begin
CalcIndent(CurPos.Y); CalcIndent(CurPos.Y);
if CurPos.Y=GetLineCount-1 then if CurPos.Y=GetLineCount-1 then
begin begin
AddLine(IndentStr); AddLine(IndentStr);
AdjustSelection(0,1); AdjustSelectionBefore(0,1);
LimitsChanged; LimitsChanged;
SetStoreUndo(HoldUndo); SetStoreUndo(HoldUndo);
UpdateAttrs(CurPos.Y,attrAll); UpdateAttrs(CurPos.Y,attrAll);
@ -4890,6 +4904,7 @@ begin
DeleteLine(CurPos.Y); DeleteLine(CurPos.Y);
LimitsChanged; LimitsChanged;
SetCurPtr(CI,CurPos.Y-1); SetCurPtr(CI,CurPos.Y-1);
AdjustSelectionPos(Ci,CurPos.Y,CurPos.X-SCP.X,CurPos.Y-SCP.Y);
end; end;
end end
else else
@ -4926,9 +4941,9 @@ begin
SetStoreUndo(HoldUndo); SetStoreUndo(HoldUndo);
Addaction(eaDeleteText,SCP,CurPos,Copy(S,CI,OI-CI),GetFlags); Addaction(eaDeleteText,SCP,CurPos,Copy(S,CI,OI-CI),GetFlags);
SetStoreUndo(false); SetStoreUndo(false);
AdjustSelection(CurPos.X-SCP.X,CurPos.Y-SCP.Y);
end; end;
UpdateAttrs(CurPos.Y,attrAll); UpdateAttrs(CurPos.Y,attrAll);
AdjustSelection(CurPos.X-SCP.X,CurPos.Y-SCP.Y);
DrawLines(CurPos.Y); DrawLines(CurPos.Y);
SetStoreUndo(HoldUndo); SetStoreUndo(HoldUndo);
SetModified(true); SetModified(true);
@ -4952,16 +4967,21 @@ begin
if CurPos.Y<GetLineCount-1 then if CurPos.Y<GetLineCount-1 then
begin begin
SetLineText(CurPos.Y,S+CharStr(' ',CurPOS.X-Length(S))+GetLineText(CurPos.Y+1)); SetLineText(CurPos.Y,S+CharStr(' ',CurPOS.X-Length(S))+GetLineText(CurPos.Y+1));
SDX:=CurPos.X;
SetStoreUndo(HoldUndo); SetStoreUndo(HoldUndo);
SCP.X:=0;SCP.Y:=CurPos.Y+1; SCP.X:=0;SCP.Y:=CurPos.Y+1;
AddGroupedAction(eaDelChar); AddGroupedAction(eaDelChar);
AddAction(eaMoveCursor,CurPos,SCP,'',GetFlags); AddAction(eaMoveCursor,CurPos,SCP,'',GetFlags);
AddAction(eaDeleteLine,SCP,CurPos,GetLineText(CurPos.Y+1),GetFlags); S:=GetLineText(CurPos.Y+1);
AddAction(eaDeleteLine,SCP,CurPos,S,GetFlags);
CloseGroupedAction(eaDelChar); CloseGroupedAction(eaDelChar);
SetStoreUndo(false); SetStoreUndo(false);
DeleteLine(CurPos.Y+1); DeleteLine(CurPos.Y+1);
LimitsChanged; LimitsChanged;
SDX:=0; SDY:=-1; SDY:=-1;
SetCurPtr(CurPos.X,CurPos.Y);
UpdateAttrs(CurPos.Y,attrAll);
AdjustSelectionPos(CurPos.X,CurPos.Y,SDX,SDY);
end; end;
end end
else else
@ -4990,10 +5010,10 @@ begin
end; end;
SetLineText(CurPos.Y,S); SetLineText(CurPos.Y,S);
SDX:=-1;SDY:=0; SDX:=-1;SDY:=0;
end;
SetCurPtr(CurPos.X,CurPos.Y); SetCurPtr(CurPos.X,CurPos.Y);
UpdateAttrs(CurPos.Y,attrAll); UpdateAttrs(CurPos.Y,attrAll);
AdjustSelection(SDX,SDY); AdjustSelection(SDX,SDY);
end;
DrawLines(CurPos.Y); DrawLines(CurPos.Y);
SetStoreUndo(HoldUndo); SetStoreUndo(HoldUndo);
SetModified(true); SetModified(true);
@ -5111,7 +5131,7 @@ begin
SetStoreUndo(false); SetStoreUndo(false);
DeleteLine(CurPos.Y); DeleteLine(CurPos.Y);
LimitsChanged; LimitsChanged;
AdjustSelection(0,-1); AdjustSelectionBefore(0,-1);
SetCurPtr(0,CurPos.Y); SetCurPtr(0,CurPos.Y);
UpdateAttrs(Max(0,CurPos.Y-1),attrAll); UpdateAttrs(Max(0,CurPos.Y-1),attrAll);
DrawLines(CurPos.Y); DrawLines(CurPos.Y);
@ -7254,7 +7274,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.40 2003-01-21 11:03:56 pierre Revision 1.41 2003-01-29 00:29:14 pierre
* attempt to fix webbugs 2346-2348
Revision 1.40 2003/01/21 11:03:56 pierre
* fix problem with Paste from Menu web bug 2173 * fix problem with Paste from Menu web bug 2173
Revision 1.39 2002/12/18 01:18:10 pierre Revision 1.39 2002/12/18 01:18:10 pierre