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

+ unicode version of unit outline

Browse Source 
git-svn-id: branches/unicodekvm@48571 -
This commit is contained in:
nickysn 2021-02-09 23:33:37 +00:00
parent 074f72b64b
commit 346cf6a32f
4 changed files with 114 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -5030,6 +5030,7 @@ packages/fv/src/time.pas svneol=native#text/plain
packages/fv/src/timeddlg.pas svneol=native#text/plain packages/fv/src/timeddlg.pas svneol=native#text/plain
packages/fv/src/udrivers.pas svneol=native#text/plain packages/fv/src/udrivers.pas svneol=native#text/plain
packages/fv/src/unixsmsg.inc svneol=native#text/plain packages/fv/src/unixsmsg.inc svneol=native#text/plain
packages/fv/src/uoutline.pas svneol=native#text/plain
packages/fv/src/uviews.pas svneol=native#text/plain packages/fv/src/uviews.pas svneol=native#text/plain
packages/fv/src/validate.pas svneol=native#text/plain packages/fv/src/validate.pas svneol=native#text/plain
packages/fv/src/views.inc svneol=native#text/plain packages/fv/src/views.inc svneol=native#text/plain

7
packages/fv/fpmake.pp
View File

@ -204,6 +204,13 @@ begin
AddUnit('drivers'); AddUnit('drivers');
AddUnit('views'); AddUnit('views');
end; end;
T:=P.Targets.AddUnit('uoutline.pas');
with T.Dependencies do
begin
AddInclude('outline.inc');
AddUnit('udrivers');
AddUnit('uviews');
end;
T:=P.Targets.AddUnit('statuses.pas'); T:=P.Targets.AddUnit('statuses.pas');
with T.Dependencies do with T.Dependencies do
begin begin

105
packages/fv/src/outline.inc
View File

@ -1,4 +1,8 @@
{$ifdef FV_UNICODE}
unit uoutline;
{$else FV_UNICODE}
unit outline; unit outline;
{$endif FV_UNICODE}
{$CODEPAGE cp437} {$CODEPAGE cp437}
@ -6,12 +10,20 @@ unit outline;
interface interface
{***************************************************************************} {***************************************************************************}
{$ifdef FV_UNICODE}
uses udrivers,objects,uviews;
{$else FV_UNICODE}
uses drivers,objects,views; uses drivers,objects,views;
{$endif FV_UNICODE}
type Pnode=^Tnode; type Pnode=^Tnode;
Tnode=record Tnode=record
next:Pnode; next:Pnode;
{$ifdef FV_UNICODE}
text:UnicodeString;
{$else FV_UNICODE}
text:Pstring; text:Pstring;
{$endif FV_UNICODE}
childlist:Pnode; childlist:Pnode;
expanded:boolean; expanded:boolean;
end; end;
@ -22,21 +34,35 @@ type Pnode=^Tnode;
constructor init(var bounds:Trect; constructor init(var bounds:Trect;
AHscrollbar,AVscrollbar:Pscrollbar); AHscrollbar,AVscrollbar:Pscrollbar);
procedure adjust(node:pointer;expand:boolean);virtual; procedure adjust(node:pointer;expand:boolean);virtual;
{$ifdef FV_UNICODE}
function creategraph(level:SmallInt;lines:longint;
flags:word;levwidth,endwidth:SmallInt;
const chars:UnicodeString):UnicodeString;
{$else FV_UNICODE}
function creategraph(level:SmallInt;lines:longint; function creategraph(level:SmallInt;lines:longint;
flags:word;levwidth,endwidth:SmallInt; flags:word;levwidth,endwidth:SmallInt;
const chars:string):string; const chars:string):string;
{$endif FV_UNICODE}
procedure draw;virtual; procedure draw;virtual;
procedure expandall(node:pointer); procedure expandall(node:pointer);
function firstthat(test:codepointer):pointer; function firstthat(test:codepointer):pointer;
procedure focused(i:sw_integer);virtual; procedure focused(i:sw_integer);virtual;
procedure foreach(action:codepointer); procedure foreach(action:codepointer);
function getchild(node:pointer;i:sw_integer):pointer;virtual; function getchild(node:pointer;i:sw_integer):pointer;virtual;
{$ifdef FV_UNICODE}
function getgraph(level:SmallInt;lines:longint;flags:word):UnicodeString;
{$else FV_UNICODE}
function getgraph(level:SmallInt;lines:longint;flags:word):string; function getgraph(level:SmallInt;lines:longint;flags:word):string;
{$endif FV_UNICODE}
function getnode(i:sw_integer):pointer;virtual; function getnode(i:sw_integer):pointer;virtual;
function getnumchildren(node:pointer):sw_integer;virtual; function getnumchildren(node:pointer):sw_integer;virtual;
function getpalette:Ppalette;virtual; function getpalette:Ppalette;virtual;
function getroot:pointer;virtual; function getroot:pointer;virtual;
{$ifdef FV_UNICODE}
function gettext(node:pointer):UnicodeString;virtual;
{$else FV_UNICODE}
function gettext(node:pointer):string;virtual; function gettext(node:pointer):string;virtual;
{$endif FV_UNICODE}
procedure handleevent(var event:Tevent);virtual; procedure handleevent(var event:Tevent);virtual;
function haschildren(node:pointer):boolean;virtual; function haschildren(node:pointer):boolean;virtual;
function isexpanded(node:pointer):boolean;virtual; function isexpanded(node:pointer):boolean;virtual;
@ -60,7 +86,11 @@ type Pnode=^Tnode;
function getchild(node:pointer;i:sw_integer):pointer;virtual; function getchild(node:pointer;i:sw_integer):pointer;virtual;
function getnumchildren(node:pointer):sw_integer;virtual; function getnumchildren(node:pointer):sw_integer;virtual;
function getroot:pointer;virtual; function getroot:pointer;virtual;
{$ifdef FV_UNICODE}
function gettext(node:pointer):UnicodeString;virtual;
{$else FV_UNICODE}
function gettext(node:pointer):string;virtual; function gettext(node:pointer):string;virtual;
{$endif FV_UNICODE}
function haschildren(node:pointer):boolean;virtual; function haschildren(node:pointer):boolean;virtual;
function isexpanded(node:pointer):boolean;virtual; function isexpanded(node:pointer):boolean;virtual;
destructor done;virtual; destructor done;virtual;
@ -72,7 +102,11 @@ const ovExpanded = $1;
Coutlineviewer=Cscroller+#8#8; Coutlineviewer=Cscroller+#8#8;
{$ifdef FV_UNICODE}
function newnode(const Atext:UnicodeString;Achildren,Anext:Pnode):Pnode;
{$else FV_UNICODE}
function newnode(const Atext:string;Achildren,Anext:Pnode):Pnode; function newnode(const Atext:string;Achildren,Anext:Pnode):Pnode;
{$endif FV_UNICODE}
procedure disposenode(node:Pnode); procedure disposenode(node:Pnode);
@ -85,14 +119,22 @@ type TMyFunc = function(_EBP: Pointer; Cur: Pointer;
Flags: Word): Boolean; Flags: Word): Boolean;
{$ifdef FV_UNICODE}
function newnode(const Atext:UnicodeString;Achildren,Anext:Pnode):Pnode;
{$else FV_UNICODE}
function newnode(const Atext:string;Achildren,Anext:Pnode):Pnode; function newnode(const Atext:string;Achildren,Anext:Pnode):Pnode;
{$endif FV_UNICODE}
begin begin
newnode:=new(Pnode); newnode:=new(Pnode);
with newnode^ do with newnode^ do
begin begin
next:=Anext; next:=Anext;
{$ifdef FV_UNICODE}
text:=Atext;
{$else FV_UNICODE}
text:=newstr(Atext); text:=newstr(Atext);
{$endif FV_UNICODE}
childlist:=Achildren; childlist:=Achildren;
expanded:=true; expanded:=true;
end; end;
@ -106,7 +148,9 @@ begin
while node<>nil do while node<>nil do
begin begin
disposenode(node^.childlist); disposenode(node^.childlist);
{$ifndef FV_UNICODE}
disposestr(node^.text); disposestr(node^.text);
{$endif FV_UNICODE}
next:=node^.next; next:=node^.next;
dispose(node); dispose(node);
node:=next; node:=next;
@ -132,9 +176,15 @@ begin
abstract; abstract;
end; end;
{$ifdef FV_UNICODE}
function TOutlineViewer.CreateGraph(Level: SmallInt; Lines: LongInt;
Flags: Word; LevWidth, EndWidth: SmallInt;
const Chars: UnicodeString): UnicodeString;
{$else FV_UNICODE}
function TOutlineViewer.CreateGraph(Level: SmallInt; Lines: LongInt; function TOutlineViewer.CreateGraph(Level: SmallInt; Lines: LongInt;
Flags: Word; LevWidth, EndWidth: SmallInt; Flags: Word; LevWidth, EndWidth: SmallInt;
const Chars: String): String; const Chars: String): String;
{$endif FV_UNICODE}
const const
FillerOrBar = 0; FillerOrBar = 0;
YorL = 2; YorL = 2;
@ -143,7 +193,11 @@ const
var var
Last, Children, Expanded: Boolean; Last, Children, Expanded: Boolean;
I , J : Byte; I , J : Byte;
{$ifdef FV_UNICODE}
Graph : UnicodeString;
{$else FV_UNICODE}
Graph : String; Graph : String;
{$endif FV_UNICODE}
begin begin
{ Load registers } { Load registers }
@ -193,7 +247,7 @@ begin
else else
Graph[J] := Chars[Retracted+1]; Graph[J] := Chars[Retracted+1];
end; end;
Graph[0] := Char(J); SetLength(Graph, J);
CreateGraph := Graph; CreateGraph := Graph;
end; end;
@ -269,7 +323,11 @@ var c_normal,c_normal_x,c_select,c_focus:byte;
lines:longint;flags:word):boolean; lines:longint;flags:word):boolean;
var c,i:byte; var c,i:byte;
{$ifdef FV_UNICODE}
s,t:UnicodeString;
{$else FV_UNICODE}
s,t:string; s,t:string;
{$endif FV_UNICODE}
begin begin
draw_item:=position>=delta.y+size.y; draw_item:=position>=delta.y+size.y;
@ -293,13 +351,29 @@ var c_normal,c_normal_x,c_select,c_focus:byte;
{Fill drawbuffer with graph and text to draw.} {Fill drawbuffer with graph and text to draw.}
for i:=0 to size.x-1 do for i:=0 to size.x-1 do
begin begin
{$ifdef FV_UNICODE}
b[i].Attribute:=c;
{$else FV_UNICODE}
wordrec(b[i]).hi:=c; wordrec(b[i]).hi:=c;
{$endif FV_UNICODE}
if i+delta.x<length(s) then if i+delta.x<length(s) then
{$ifdef FV_UNICODE}
b[i].ExtendedGraphemeCluster:=s[1+i+delta.x]
{$else FV_UNICODE}
wordrec(b[i]).lo:=byte(s[1+i+delta.x]) wordrec(b[i]).lo:=byte(s[1+i+delta.x])
{$endif FV_UNICODE}
else if 1+i+delta.x-length(s)<=length(t) then else if 1+i+delta.x-length(s)<=length(t) then
{$ifdef FV_UNICODE}
b[i].ExtendedGraphemeCluster:=t[1+i+delta.x-length(s)]
{$else FV_UNICODE}
wordrec(b[i]).lo:=byte(t[1+i+delta.x-length(s)]) wordrec(b[i]).lo:=byte(t[1+i+delta.x-length(s)])
{$endif FV_UNICODE}
else else
{$ifdef FV_UNICODE}
b[i].ExtendedGraphemeCluster:=' ';
{$else FV_UNICODE}
wordrec(b[i]).lo:=byte(' '); wordrec(b[i]).lo:=byte(' ');
{$endif FV_UNICODE}
end; end;
{Draw!} {Draw!}
@ -374,12 +448,21 @@ begin
abstract; abstract;
end; end;
{$ifdef FV_UNICODE}
function Toutlineviewer.getgraph(level:SmallInt;lines:longint;
flags:word):UnicodeString;
begin
getgraph:=creategraph(level,lines,flags,3,3,#$0020#$2502#$251C#$2514#$2500#$2500#$002B#$2500);
end;
{$else FV_UNICODE}
function Toutlineviewer.getgraph(level:SmallInt;lines:longint; function Toutlineviewer.getgraph(level:SmallInt;lines:longint;
flags:word):string; flags:word):string;
begin begin
getgraph:=creategraph(level,lines,flags,3,3,' ³ÃÀÄÄ+Ä'); getgraph:=creategraph(level,lines,flags,3,3,' ³ÃÀÄÄ+Ä');
end; end;
{$endif FV_UNICODE}
function Toutlineviewer.getnode(i:sw_integer):pointer; function Toutlineviewer.getnode(i:sw_integer):pointer;
@ -414,7 +497,11 @@ begin
abstract; abstract;
end; end;
{$ifdef FV_UNICODE}
function Toutlineviewer.gettext(node:pointer):UnicodeString;
{$else FV_UNICODE}
function Toutlineviewer.gettext(node:pointer):string; function Toutlineviewer.gettext(node:pointer):string;
{$endif FV_UNICODE}
begin begin
abstract; abstract;
@ -427,9 +514,17 @@ var mouse:Tpoint;
new_focus:sw_integer; new_focus:sw_integer;
count:byte; count:byte;
handled,m,mouse_drag:boolean; handled,m,mouse_drag:boolean;
{$ifdef FV_UNICODE}
graph:UnicodeString;
{$else FV_UNICODE}
graph:string; graph:string;
{$endif FV_UNICODE}
{$ifdef FV_UNICODE}
function graph_of_focus(var graph:UnicodeString):pointer;
{$else FV_UNICODE}
function graph_of_focus(var graph:string):pointer; function graph_of_focus(var graph:string):pointer;
{$endif FV_UNICODE}
var _level:sw_integer; var _level:sw_integer;
_lines:longInt; _lines:longInt;
@ -674,11 +769,19 @@ begin
getroot:=root; getroot:=root;
end; end;
{$ifdef FV_UNICODE}
function Toutline.gettext(node:pointer):UnicodeString;
{$else FV_UNICODE}
function Toutline.gettext(node:pointer):string; function Toutline.gettext(node:pointer):string;
{$endif FV_UNICODE}
begin begin
assert(node<>nil); assert(node<>nil);
{$ifdef FV_UNICODE}
gettext:=Pnode(node)^.text;
{$else FV_UNICODE}
gettext:=Pnode(node)^.text^; gettext:=Pnode(node)^.text^;
{$endif FV_UNICODE}
end; end;
function Toutline.haschildren(node:pointer):boolean; function Toutline.haschildren(node:pointer):boolean;

2
packages/fv/src/uoutline.pas Normal file
View File

@ -0,0 +1,2 @@
{$DEFINE FV_UNICODE}
{$I outline.inc}