paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 02:28:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Microsoft copy/paste keys for Input Lines"

Browse Source 
This reverts commit 660836e027
This commit is contained in:
Michael Van Canneyt 2024-09-04 09:03:47 +00:00
parent a1fad6bfc0
commit 8b0ed99fbc
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
packages/ide/fpviews.pas
View File

@ -541,6 +541,10 @@ const menu_key_edit_cut:string[63]=menu_key_edit_cut_borland;
menu_key_edit_paste:string[63]=menu_key_edit_paste_borland;
menu_key_edit_all:string[63]=menu_key_edit_all_borland;
menu_key_hlplocal_copy:string[63]=menu_key_hlplocal_copy_borland;
cut_key:word=kbShiftDel;
copy_key:word=kbCtrlIns;
paste_key:word=kbShiftIns;
all_key:word=kbNoKey;
procedure RegisterFPViews;
@ -3658,7 +3662,7 @@ begin
if HeaderLen>Size.X-2 then HeaderLen:=Size.X-2;
{ --- 1. sor --- }
ClearBuf; MoveChar(B[0],'<EFBFBD>',C1,1); MoveChar(B[HeaderLen+1],'<EFBFBD>',C1,1);
ClearBuf; MoveChar(B[0],'³',C1,1); MoveChar(B[HeaderLen+1],'³',C1,1);
X:=1;
for i:=0 to DefCount-1 do
begin
@ -3671,47 +3675,47 @@ begin
end
else C:=C2;
MoveCStr(B[X],' '+Name^+' ',C); X:=X+X2+3;
MoveChar(B[X-1],'<EFBFBD>',C1,1);
MoveChar(B[X-1],'³',C1,1);
end;
SWriteBuf(0,1,Size.X,1,B);
{ --- 0. sor --- }
ClearBuf; MoveChar(B[0],'<EFBFBD>',C1,1);
ClearBuf; MoveChar(B[0],'Ú',C1,1);
X:=1;
for i:=0 to DefCount-1 do
begin
if I<ActiveDef then FC:='<EFBFBD>'
else FC:='<EFBFBD>';
if I<ActiveDef then FC:='Ú'
else FC:='¿';
X2:=CStrLen(AtTab(i)^.Name^)+2;
MoveChar(B[X+X2],{'<EFBFBD>'}FC,C1,1);
MoveChar(B[X+X2],{'Â'}FC,C1,1);
if i=DefCount-1 then X2:=X2+1;
if X2>0 then
MoveChar(B[X],'<EFBFBD>',C1,X2);
MoveChar(B[X],'Ä',C1,X2);
X:=X+X2+1;
end;
MoveChar(B[HeaderLen+1],'<EFBFBD>',C1,1);
MoveChar(B[ActiveKPos],'<EFBFBD>',C1,1); MoveChar(B[ActiveVPos],'<EFBFBD>',C1,1);
MoveChar(B[HeaderLen+1],'¿',C1,1);
MoveChar(B[ActiveKPos],'Ú',C1,1); MoveChar(B[ActiveVPos],'¿',C1,1);
SWriteBuf(0,0,Size.X,1,B);
{ --- 2. sor --- }
MoveChar(B[1],'<EFBFBD>',C1,Max(HeaderLen,0)); MoveChar(B[HeaderLen+2],'<EFBFBD>',C1,Max(Size.X-HeaderLen-3,0));
MoveChar(B[Size.X-1],'<EFBFBD>',C1,1);
MoveChar(B[ActiveKPos],'<EFBFBD>',C1,1);
if ActiveDef=0 then MoveChar(B[0],'<EFBFBD>',C1,1)
else MoveChar(B[0],{'<EFBFBD>'}'<27>',C1,1);
MoveChar(B[HeaderLen+1],'<EFBFBD>'{'<27>'},C1,1); MoveChar(B[ActiveVPos],'<EFBFBD>',C1,1);
MoveChar(B[1],'Ä',C1,Max(HeaderLen,0)); MoveChar(B[HeaderLen+2],'Ä',C1,Max(Size.X-HeaderLen-3,0));
MoveChar(B[Size.X-1],'¿',C1,1);
MoveChar(B[ActiveKPos],'Ù',C1,1);
if ActiveDef=0 then MoveChar(B[0],'³',C1,1)
else MoveChar(B[0],{'Ã'}'Ú',C1,1);
MoveChar(B[HeaderLen+1],'Ä'{'Á'},C1,1); MoveChar(B[ActiveVPos],'À',C1,1);
MoveChar(B[ActiveKPos+1],' ',C1,Max(ActiveVPos-ActiveKPos-1,0));
SWriteBuf(0,2,Size.X,1,B);
{ --- marad<EFBFBD>k sor --- }
ClearBuf; MoveChar(B[0],'<EFBFBD>',C1,1); MoveChar(B[Size.X-1],'<EFBFBD>',C1,1);
{ --- marad‚k sor --- }
ClearBuf; MoveChar(B[0],'³',C1,1); MoveChar(B[Size.X-1],'³',C1,1);
for i:=3 to Size.Y-1 do
SWriteBuf(0,i,Size.X,1,B);
{ SWriteBuf(0,3,Size.X,Size.Y-4,B); this was wrong
because WriteBuf then expect a buffer of size size.x*(size.y-4)*2 PM }
{ --- Size.X . sor --- }
MoveChar(B[0],'<EFBFBD>',C1,1); MoveChar(B[1],'<EFBFBD>',C1,Max(Size.X-2,0)); MoveChar(B[Size.X-1],'<EFBFBD>',C1,1);
MoveChar(B[0],'À',C1,1); MoveChar(B[1],'Ä',C1,Max(Size.X-2,0)); MoveChar(B[Size.X-1],'Ù',C1,1);
SWriteBuf(0,Size.Y-1,Size.X,1,B);
{ - End of TGroup.Draw - }
@ -4297,7 +4301,7 @@ begin
R2.Move(0,2);
Insert(New(PStaticText, Init(R2, ^C'Copyright (C) 1998-2020 by')));
R2.Move(0,2);
Insert(New(PStaticText, Init(R2, ^C'B<EFBFBD>rczi G<>bor')));
Insert(New(PStaticText, Init(R2, ^C'B‚rczi G bor')));
R2.Move(0,1);
Insert(New(PStaticText, Init(R2, ^C'Pierre Muller')));
R2.Move(0,1);
@ -4313,14 +4317,14 @@ begin
AddLine(^C'< Compiler development >');
AddLine(^C'Carl-Eric Codere');
AddLine(^C'Daniel Mantione');
AddLine(^C'Florian Kl<EFBFBD>mpfl');
AddLine(^C'Florian Kl„mpfl');
AddLine(^C'Jonas Maebe');
AddLine(^C'Mich<EFBFBD>el Van Canneyt');
AddLine(^C'Mich„el Van Canneyt');
AddLine(^C'Peter Vreman');
AddLine(^C'Pierre Muller');
AddLine('');
AddLine(^C'< IDE development >');
AddLine(^C'B<EFBFBD>rczi G<>bor');
AddLine(^C'B‚rczi G bor');
AddLine(^C'Peter Vreman');
AddLine(^C'Pierre Muller');
AddLine('');

11
packages/ide/weditor.pas
View File

@ -737,11 +737,6 @@ const
selection (PM) }
DontConsiderShiftState: boolean = false;
cut_key:word=kbShiftDel;
copy_key:word=kbCtrlIns;
paste_key:word=kbShiftIns;
all_key:word=kbNoKey;
CodeCompleteMinLen : byte = 4; { minimum length of text to try to complete }
ToClipCmds : TCommandSet = ([cmCut,cmCopy,cmCopyWin,
@ -7011,7 +7006,7 @@ begin
end;
ClearEvent(Event);
End
else if ((Event.KeyCode=kbShiftIns) or (Event.KeyCode=paste_key)) and
else if (Event.KeyCode=kbShiftIns) and
Assigned(Clipboard) and (Clipboard^.ValidBlock) then
{ paste from clipboard }
begin
@ -7039,7 +7034,7 @@ begin
end;
ClearEvent(Event);
end
else if ((Event.KeyCode=kbCtrlIns) or (Event.KeyCode=copy_key)) and
else if (Event.KeyCode=kbCtrlIns) and
Assigned(Clipboard) then
{ Copy to clipboard }
begin
@ -7050,7 +7045,7 @@ begin
Clipboard^.SelEnd:=Clipboard^.CurPos;
ClearEvent(Event);
end
else if ((Event.KeyCode=kbShiftDel) or (Event.KeyCode=cut_key)) and
else if (Event.KeyCode=kbShiftDel) and
Assigned(Clipboard) then
{ Cut to clipboard }
begin