WebSVN – Kolibri OS – Diff – /programs/other/fb2reader/SRC/DOM.ob07

 (*
-    Copyright 2016-2022 Anton Krotov
+    Copyright 2016-2023 Anton Krotov
     This file is part of fb2read.
 *)
 MODULE DOM;
 IMPORT XML, SU := SysUtils, S := Strings, Font, Window, G := Graph, LibImg,
-       RF := ReadFile, File, Write, Read, Ini, K := KOSAPI, sys := SYSTEM,
+       RF := ReadFile, File, Ini, K := KOSAPI, sys := SYSTEM,
     LEVEL,
     SUB,
     SUP,
     InterLin*,
     Picture*,
+    picture_fsize*,
     SpaceW: INTEGER
   END;
 VAR
   Settings* : TSettings;
-  Canvas_X, Canvas_Y: INTEGER;
-  ColLeft   : Window.TRect;
+  Canvas_X, Canvas_Y: INTEGER;
-  ColRight  : Window.TRect;
+  ColLeft, ColRight: Window.tRect;
     tables.table(t, W, FALSE)
   END
 END table;
-PROCEDURE layout(body: XML.ELEMENT);
-VAR
-  cur       : XML.ELEMENT;
-  tag       : XML.TAG;
-  word      : XML.WORD;
-  text      : XML.TEXT;
-  tag_value : INTEGER;
-  _align    : INTEGER;
-  title     : XML.ELEMENT;
-  width     : INTEGER;
-  height1   : INTEGER;
-  height2   : INTEGER;
-  PROCEDURE Image (VAR tag: XML.TAG);
+PROCEDURE Image (VAR tag: XML.TAG; destroy: BOOLEAN);
-  VAR
+VAR
-    note  : BOOLEAN;
+	note  : BOOLEAN;
-    img   : XML.TAG;
+	img   : XML.TAG;
-    URL   : INTEGER;
+	URL   : INTEGER;
-    chars : S.CHARS;
+	chars : S.CHARS;
-    sizeY : INTEGER;
+	sizeY : INTEGER;
-    FName : S.STRING;
+	FName : S.STRING;
-    path  : S.STRING;
-  BEGIN
+	path  : S.STRING;
-    IF tag.img # 0 THEN
-      LibImg.img_destroy(tag.img)
+BEGIN
-    END;
+	LibImg.Destroy(tag.img);
-    img := XML.GetRef(tag, note, URL);
+	img := XML.GetRef(tag, note, URL);
-    IF img # NIL THEN
+	IF img # NIL THEN
-      IF img.child.first IS XML.WORD THEN
+		IF img.child.first IS XML.WORD THEN
-        chars := img.child.first(XML.WORD).value;
-        tag.img := LibImg.GetImg(chars.first, chars.last - chars.first + 1, W, sizeY);
-        IF tag.img # 0 THEN
-          INC(Y, (sizeY DIV LineH) * LineH);
-          NewLine;
-          tag.Ymax := Y - Y MOD LineH
+			chars := img.child.first(XML.WORD).value;
-        END
+			tag.img := LibImg.GetImg(chars.first, chars.last - chars.first + 1, W, sizeY)
-      END
+		END
-    ELSIF URL # 0 THEN
+	ELSIF URL # 0 THEN
-      S.PtrToString(URL, FName);
+		S.PtrToString(URL, FName);
-      tag.img := LibImg.LoadFromFile(FName, W, sizeY);
+		tag.img := LibImg.LoadFromFile(FName, W, sizeY);
-      IF tag.img = 0 THEN
+		IF tag.img = 0 THEN
-        path := FilePath;
+			path := FilePath;
-        IF FName[0] # "/" THEN
+			IF FName[0] # "/" THEN
-          S.Append(path, "/")
+				S.Append(path, "/")
-        END;
+			END;
+			S.Append(path, FName);
-        S.Append(path, FName);
+			tag.img := LibImg.LoadFromFile(path, W, sizeY)
-        tag.img := LibImg.LoadFromFile(path, W, sizeY);
+		END
-      END;
+	END;
-      IF tag.img # 0 THEN
+	IF (tag.img # 0) & destroy THEN
-        INC(Y, (sizeY DIV LineH) * LineH);
+		INC(Y, (sizeY DIV LineH) * LineH);
-        NewLine;
+		NewLine;
-        tag.Ymax := Y - Y MOD LineH
+		tag.Ymax := Y - Y MOD LineH;
-      END
+		LibImg.Destroy(tag.img)
+	END
+END Image;
+PROCEDURE layout(body: XML.ELEMENT);
+VAR
+  cur       : XML.ELEMENT;
+  tag       : XML.TAG;
+  word      : XML.WORD;
+  text      : XML.TEXT;
+  tag_value : INTEGER;
+  _align    : INTEGER;
+  title     : XML.ELEMENT;
-    END
+  width     : INTEGER;
-  END Image;
+  height1   : INTEGER;
   height2   : INTEGER;
 BEGIN
         Sub(FALSE)
       |XML.tag_code:
         DEC(code);
         Font.sysfont(code > 0)
       |XML.tag_image:
-        Image(tag)
+        Image(tag, TRUE)
       |XML.tag_table:
         Y := tag.Ymin + tables.get_table_height(tag.table);
         tag.Ymax := Y - Y MOD LineH;
         NewLine;
       |XML.tag_td, XML.tag_th:
   text  : XML.TEXT;
   tag   : XML.TAG;
   y, y0 : INTEGER;
   value : INTEGER;
-  PROCEDURE DrawText(Col: Window.TRect; min, max, y0, y: INTEGER; right: BOOLEAN; VAR text: XML.TEXT);
+  PROCEDURE DrawText(Col: Window.tRect; min, max, y0, y: INTEGER; right: BOOLEAN; VAR text: XML.TEXT);
   VAR word: XML.WORD;
   BEGIN
     IF (min <= y0) & (y0 <= max) THEN
       Font.sysfont(code > 0);
       IF text IS XML.WORD THEN
         word := text(XML.WORD);
-        Font.Text(Col, word.X, y - Col.Height * ORD(right), word.value.first, word.length);
+        Font.Text(Col, word.X, y - Col.height * ORD(right), word.value.first, word.length);
       END;
-      Font.StrikeText(Col, text.X, y - Col.Height * ORD(right), text.width)
+      Font.StrikeText(Col, text.X, y - Col.height * ORD(right), text.width)
     END
   END DrawText;
-  PROCEDURE Image(VAR tag: XML.TAG);
+  PROCEDURE DrawImage(VAR tag: XML.TAG);
   VAR sizeX, sizeY, img, y: INTEGER;
   BEGIN
     IF tag.img # 0 THEN
       y := Ycur;
       LibImg.GetInf(tag.img, sizeX, sizeY, img);
-      IF (y <= tag.Ymax) & (tag.Ymin <= y + ColLeft.Height) THEN
+      IF (y <= tag.Ymax) & (tag.Ymin <= y + ColLeft.height) THEN
-        G.Image(ColLeft.Left + tag.X, tag.Ymin - y + ColLeft.Top, sizeX, sizeY, img, ColLeft.Top, ColLeft.Top + ColLeft.Height - 1)
+        G.Image(ColLeft.left + tag.X, tag.Ymin - y + ColLeft.top, sizeX, sizeY, img, ColLeft.top, ColLeft.top + ColLeft.height - 1)
       END;
       IF Settings.TwoCol THEN
-        y := Ycur + ColLeft.Height;
+        y := Ycur + ColLeft.height;
-        IF (y <= tag.Ymax) & (tag.Ymin <= y + ColRight.Height) THEN
+        IF (y <= tag.Ymax) & (tag.Ymin <= y + ColRight.height) THEN
-          G.Image(ColRight.Left + tag.X, tag.Ymin - y + ColLeft.Top, sizeX, sizeY, img, ColRight.Top, ColRight.Top + ColRight.Height - 1)
+          G.Image(ColRight.left + tag.X, tag.Ymin - y + ColLeft.top, sizeX, sizeY, img, ColRight.top, ColRight.top + ColRight.height - 1)
         END
       END
     END
-  END Image;
+  END DrawImage;
   PROCEDURE td(VAR tag: XML.TAG);
   VAR x1, y1, x2, y2, cl: INTEGER;
   BEGIN
-    x1 := tag.X + ColLeft.Left;
+    x1 := tag.X + ColLeft.left;
-    y1 := tag.Ymin - Ycur + ColLeft.Top;
+    y1 := tag.Ymin - Ycur + ColLeft.top;
     x2 := x1 + tag.Width;
     y2 := y1 + tables.get_height(tag.table, tag.cell);
     cl := G.GetColor();
     G.SetColor(Settings.Colors[TEXT_COLOR]);
     G.Rect(x1, y1, x2, y2);
     IF Settings.TwoCol THEN
-      x1 := x1 - ColLeft.Left + ColRight.Left;
+      x1 := x1 - ColLeft.left + ColRight.left;
-      x2 := x2 - ColLeft.Left + ColRight.Left;
+      x2 := x2 - ColLeft.left + ColRight.left;
-      y1 := y1 - ColLeft.Height;
+      y1 := y1 - ColLeft.height;
-      y2 := y2 - ColLeft.Height;
+      y2 := y2 - ColLeft.height;
       G.Rect(x1, y1, x2, y2)
         Font.Strike(TRUE)
       |XML.tag_epigraph, XML.tag_cite, XML.tag_emphasis:
         INC(italic);
         Font.Italic(TRUE, refer = 0)
       |XML.tag_image:
+      	Image(tag, FALSE);
-        Image(tag)
+        DrawImage(tag);
+        LibImg.Destroy(tag.img)
       |XML.tag_code:
         INC(code)
       ELSE
       END;
       layout2(tag.child.first);
       END
     ELSIF cur IS XML.TEXT THEN
       text := cur(XML.TEXT);
       y  := text.Y - Ycur;
       y0 := y - y MOD LineH;
-      DrawText(ColLeft, 0, ColLeft.Height - LineH, y0, y, FALSE, text);
+      DrawText(ColLeft, 0, ColLeft.height - LineH, y0, y, FALSE, text);
       IF Settings.TwoCol THEN
-        DrawText(ColRight, ColLeft.Height, ColLeft.Height + ColRight.Height - LineH, y0, y, TRUE, text)
+        DrawText(ColRight, ColLeft.height, ColLeft.height + ColRight.height - LineH, y0, y, TRUE, text)
       END
     END;
     cur := cur.next
   END
 END layout2;
-PROCEDURE DrawProgress(progress_color: INTEGER);
+PROCEDURE DrawFrame (color: INTEGER);
 VAR max_X, max_Y: INTEGER;
 BEGIN
   max_X := G.Buffer.Width - 1;
   max_Y := G.Buffer.Height - 1;
-  G.SetColor(0);
+  G.SetColor(color);
   G.HLine(0, max_X, 0);
   G.HLine(0, max_X, max_Y);
   G.VLine(0, 0, max_Y);
   sb.max_area := (Ymax - Ymin) DIV LineH + 50;
   sb.cur_area := 50;
   sb.position := (Ycur - Ymin) DIV LineH;
   box_lib.scrollbar_v_draw(sb)
-END DrawProgress;
+END DrawFrame;
-PROCEDURE Draw*;
-VAR back, max_X, max_Y: INTEGER;
+PROCEDURE Draw*;
-BEGIN
+(*VAR max_Y: INTEGER;*)
+BEGIN
+  (*max_Y := G.Buffer.Height - 1;*)
+  IF Settings.b_pict & (Settings.Picture # 0) THEN
-  back  := Settings.Colors[BACK_COLOR];
+      G.Copy(G.BackImg, G.Buffer, 0, G.Buffer.Height, 0)
-  max_X := G.Buffer.Width - 1;
+  ELSE
-  max_Y := G.Buffer.Height - 1;
+      G.Fill(G.Buffer, Settings.Colors[BACK_COLOR])
-  G.Copy(G.Buffer3, G.Buffer, 0, G.Buffer.Height, 0);
+  END;
   Font.SetFontColor(Settings.Colors[TEXT_COLOR]);
   IF ((body = description) OR (body = contents)) & Settings.TwoCol THEN
     Settings.TwoCol := FALSE;
     layout2(body.child.first);
     Settings.TwoCol := TRUE;
     Search.draw(body, ColLeft, ColRight, Ycur, LineH, FALSE)
   ELSE
     layout2(body.child.first);
     Search.draw(body, ColLeft, ColRight, Ycur, LineH, Settings.TwoCol)
   END;
-  G.Copy(G.Buffer3, G.Buffer, 0, ColLeft.Top + 1, 0);
+  (*G.Copy(G.BackImg, G.Buffer, 0, ColLeft.top + 1, 0);
-  G.Copy(G.Buffer3, G.Buffer, max_Y - ColLeft.Top, ColLeft.Top + 1, max_Y - ColLeft.Top);
+  G.Copy(G.BackImg, G.Buffer, max_Y - ColLeft.top, ColLeft.top + 1, max_Y - ColLeft.top);*)
-  DrawProgress(0);
+  DrawFrame(0);
     Ymax := body.Ymax
   END
 END Descr;
-PROCEDURE Up*;
+PROCEDURE Scroll* (n: INTEGER);
 BEGIN
-  DEC(Ycur, LineH);
-  SU.MinMax(Ycur, Ymin, Ymax)
-END Up;
-PROCEDURE Down*;
-BEGIN
-  INC(Ycur, LineH);
+	INC(Ycur, LineH*n);
-  SU.MinMax(Ycur, Ymin, Ymax)
+	SU.MinMax(Ycur, Ymin, Ymax)
-END Down;
 END Scroll;
-PROCEDURE PageUp*;
-VAR i: INTEGER;
 BEGIN
-  FOR i := 1 TO Lines * (ORD(Settings.TwoCol) + 1) DO
+PROCEDURE PageUp*;
-    Up
-  END
+BEGIN
-END PageUp;
+    Scroll(-Lines * (ORD(Settings.TwoCol) + 1))
-PROCEDURE PageDown*;
+END PageUp;
 VAR i: INTEGER;
 BEGIN
     INC(i)
   END
 END layout3;
+PROCEDURE getRefProp (VAR ref, body: XML.TAG; VAR URL: INTEGER; VAR note: BOOLEAN; VAR Y: INTEGER);
+BEGIN
+	note := FALSE;
+	URL := 0;
+	Y := 0;
+	IF ref.value = XML.tag_a THEN
+		ref := XML.GetRef(ref, note, URL)
+	ELSE
+		ref := ref.parent(XML.TAG)
+	END;
+	IF ref # NIL THEN
+		Y := ref.Ymin;
+	END;
+	IF note THEN
+	  	body := ref
+	ELSE
+	  	body := GetBody(ref)
+	END
+END getRefProp;
+PROCEDURE zstreq (s1, s2: INTEGER): BOOLEAN;
+VAR
+    c1, c2: CHAR;
+BEGIN
+    REPEAT
+        sys.GET(s1, c1); INC(s1);
+        sys.GET(s2, c2); INC(s2);
+    UNTIL (c1 = 0X) OR (c2 = 0X)
+    RETURN c1 = c2
+END zstreq;
+PROCEDURE refeq (ref1, ref2: XML.TAG): BOOLEAN;
+VAR
+	body1, body2: XML.TAG;
+	URL1, URL2: INTEGER;
+	note1, note2: BOOLEAN;
+	Y1, Y2: INTEGER;
+BEGIN
+	getRefProp(ref1, body1, URL1, note1, Y1);
+	getRefProp(ref2, body2, URL2, note2, Y2);
+	RETURN (ref1 = ref2) & (body1 = body2) & (URL1 = 0) & (URL2 = 0) & (note1 = note2) & (Y1 = Y2) OR
+			(URL1 # 0) & (URL2 # 0) & zstreq(URL1, URL2)
+END refeq;
+PROCEDURE setVisited (ref: XML.TAG);
+VAR
+	i: INTEGER;
+	cur: V.ANYPTR;
+BEGIN
+	FOR i := 0 TO references.count - 1 DO
+		cur := V.get(references, i);
+		IF cur IS XML.TEXT THEN
+			cur := cur(XML.TEXT).parent;
+			IF refeq(cur(XML.TAG), ref) THEN
+				cur(XML.TAG).Visited := TRUE
+			END
+		END
+	END
+END setVisited;
 PROCEDURE MouseDown;
 BEGIN
 	IF ~mouseDown THEN
+		mouseDown := TRUE;
-		mouseDown := TRUE;
+		clickRef := ref;
+		IF ref # NIL THEN
-		clickRef := ref;
+			ref.Clicked := TRUE
-		ref.Clicked := TRUE;
+		END;
 		Draw
 			END;
 			Ymax := body.Ymax;
 			Ymin := body.Ymin;
+			IF ~clickRef.Visited THEN
-			IF ~clickRef.Visited THEN
+				setVisited(clickRef);
 				clickRef.Visited := TRUE;
 				PushRef(clickRef)
 			END
 		ELSIF URL # 0 THEN
 			SU.Run(Ini.Browser, URL);
+			IF ~clickRef.Visited THEN
-			IF ~clickRef.Visited THEN
+				setVisited(clickRef);
 				clickRef.Visited := TRUE;
 				PushRef(clickRef)
 			END
-		END;
 		END
 	END;
 	IF clickRef # NIL THEN
 		clickRef.Clicked := FALSE;
 		clickRef := NIL;
   DEC(X, Settings.PADDING.Left);
   IF (0 <= Y) & (Y <= Lines * LineH) THEN
     ref := NIL;
     layout3(body, X, Y);
     IF (ref = NIL) & Settings.TwoCol THEN
-      layout3(body, X - ColLeft.Width - Settings.PADDING.ColInter, Y + Lines * LineH);
+      layout3(body, X - ColLeft.width - Settings.PADDING.ColInter, Y + Lines * LineH);
     END;
     hoverRef := ref;
 	IF clicked THEN
 		MouseDown
 	ELSE
       DrawStatus
   END
 END Click;
-PROCEDURE Scroll*(value: INTEGER);
-BEGIN
-  value := 2 * value;
-  WHILE value > 0 DO
-    Down;
-    DEC(value)
-  ELSIF value < 0 DO
-    Up;
-    INC(value)
-  END
-END Scroll;
 PROCEDURE main(fb: XML.ELEMENT; Contents: BOOLEAN);
 VAR
   cur: XML.ELEMENT;
 BEGIN
     Search.fnext(body, y, d);
     IF y >= 0 THEN
         DEC(y, y MOD LineH);
         min := Ycur;
+        max := min + ColLeft.height - LineH;
         IF Settings.TwoCol THEN
-            max := min + ColLeft.Height + ColRight.Height - LineH
-        ELSE
-            max := min + ColLeft.Height - LineH
+            INC(max, ColRight.height)
         END;
         IF (y < min) OR (y > max) THEN
-            Ycur := MAX(y - ColLeft.Height DIV 2, 0)
+            Ycur := MAX(y - ColLeft.height DIV 2, 0)
         END;
         DEC(Ycur, Ycur MOD LineH)
   END;
   Settings.PADDING.Right     :=  Settings.PADDING.Left;
   Settings.PADDING.ColInter  :=  G.Buffer.Width * Settings.PADDING.CInt DIV 100;
   LineH := Font.FontH() + Settings.SUP + Settings.SUB + Settings.InterLin;
-  Window.InitRect(
+  Window.initRect(
     ColLeft, Settings.PADDING.Left, Settings.PADDING.Top,
     G.Buffer.Width - Settings.PADDING.Left - Settings.PADDING.Right,
     G.Buffer.Height - Settings.PADDING.Top - Settings.PADDING.Bottom);
   IF Settings.TwoCol THEN
-    ColLeft.Width := (ColLeft.Width - Settings.PADDING.ColInter) DIV 2;
+    ColLeft.width := (ColLeft.width - Settings.PADDING.ColInter) DIV 2;
     ColRight := ColLeft;
-    ColRight.Left := ColLeft.Left + ColLeft.Width + Settings.PADDING.ColInter
+    ColRight.left := ColLeft.left + ColLeft.width + Settings.PADDING.ColInter
   END;
-  W := ColLeft.Width;
+  W := ColLeft.width;
-  Lines := ColLeft.Height DIV LineH;
+  Lines := ColLeft.height DIV LineH;
-  ColLeft.Height  := Lines * LineH;
+  ColLeft.height  := Lines * LineH;
-  ColRight.Height := ColLeft.Height;
+  ColRight.height := ColLeft.height;
 END FontSizeChange;
 PROCEDURE Resize*(Width, Height: INTEGER);
-VAR d: REAL; resize: BOOLEAN; sizeX, sizeY, data: INTEGER;
+VAR d: REAL; resize: BOOLEAN; sizeX, sizeY, data, back_picture: INTEGER;
   END stk2;
 BEGIN
   resize := (Width # G.Buffer.Width) OR resized;
-  G.Resize(Width, Height);
-  G.SetColor(Settings.Colors[BACK_COLOR]);
+  G.Resize(Width, Height);
+  IF (Settings.Picture # 0) & Settings.b_pict THEN
+  	back_picture := LibImg.GetImg(Settings.Picture, Settings.picture_fsize, 1000000, sizeY);
-  IF (Settings.Picture # 0) & Settings.b_pict THEN
+  	IF back_picture # 0 THEN
+	    LibImg.GetInf(back_picture, sizeX, sizeY, data);
-    LibImg.GetInf(Settings.Picture, sizeX, sizeY, data);
+    	G.CreateBackImg;
+	    G.BackImage(sizeX, sizeY, data);
+    	LibImg.Destroy(back_picture)
-    G.BackImage(sizeX, sizeY, data);
+    END
   ELSE
-    G.Clear;
+    G.DestroyBackImg;
+    G.Fill(G.Buffer, Settings.Colors[BACK_COLOR]);
-    G.Copy(G.Buffer, G.Buffer3, 0, G.Buffer.Height, 0)
+    //G.Fill(G.BackImg, Settings.Colors[BACK_COLOR])
   END;
   IF Font.FontH() # 0 THEN
     FontSizeChange(Font.FontH());
   ELSE
     FontSizeChange(Settings.FontSize);
   END;
-  ColLeft.Width  := G.Buffer.Width - Settings.PADDING.Left - Settings.PADDING.Right;
+  ColLeft.width  := G.Buffer.Width - Settings.PADDING.Left - Settings.PADDING.Right;
   IF Settings.TwoCol THEN
-    ColLeft.Width  := (ColLeft.Width - Settings.PADDING.ColInter) DIV 2;
+    ColLeft.width  := (ColLeft.width - Settings.PADDING.ColInter) DIV 2;
-    ColRight.Width := ColLeft.Width;
+    ColRight.width := ColLeft.width;
-    ColRight.Left  := ColLeft.Left + ColLeft.Width + Settings.PADDING.ColInter
+    ColRight.left  := ColLeft.left + ColLeft.width + Settings.PADDING.ColInter
   END;
-  ColLeft.Height  := G.Buffer.Height - Settings.PADDING.Top  - Settings.PADDING.Bottom;
+  ColLeft.height  := G.Buffer.Height - Settings.PADDING.Top  - Settings.PADDING.Bottom;
-  Lines           := ColLeft.Height DIV LineH;
+  Lines           := ColLeft.height DIV LineH;
-  ColLeft.Height  := Lines * LineH;
+  ColLeft.height  := Lines * LineH;
-  ColRight.Height := ColLeft.Height;
+  ColRight.height := ColLeft.height;
   IF done & resize THEN
     resized := FALSE;
     Push(b_stk);
     stk1(b_stk);
     stk1(f_stk);
     IF contents # NIL THEN
       d := FLT(Ycont) / FLT(contents.Ymax)
     END;
-    W := ColLeft.Width;
+    W := ColLeft.width;
-    W2 := ColLeft.Width + ColRight.Width + Settings.PADDING.ColInter;
+    W2 := ColLeft.width + ColRight.width + Settings.PADDING.ColInter;
     W1 := W;
 PROCEDURE Save;
 VAR history: File.FS; win_size_x, win_size_y, size, pos: INTEGER;
   PROCEDURE WriteInt(history: File.FS; x: INTEGER);
   BEGIN
-    IF Write.Int(history, x) THEN END
+    IF File.WriteInt(history, x) THEN END
   END WriteInt;
   PROCEDURE WriteStk(history: File.FS; VAR stk: XML.LIST; links: BOOLEAN);
   ELSE
     pos := File.Seek(history, 0 , 2)
   END;
   size := 1 + 18*4 + 1 + 8*(XML.ListCount(b_stk) + XML.ListCount(f_stk)) + 4*XML.ListCount(vis_ref) + 12;
   WriteInt(history, size);
-  IF Write.Char(history, 0X) THEN END;
+  IF File.WriteChar(history, 0X) THEN END;
   WriteInt(history, fsize2);
   WriteInt(history, chksum);
   SU.GetWindowSize(win_size_x, win_size_y);
   WriteInt(history, win_size_x);
   WriteInt(history, win_size_y);
   WriteInt(history, Settings.PADDING.CInt);
   WriteInt(history, Settings.PARAGRAPH);
   WriteInt(history, Settings.EPIGRAPH);
   WriteInt(history, Settings.InterLin);
-  IF Write.Boolean(history, Settings.TwoCol) THEN END;
+  IF File.WriteBool(history, Settings.TwoCol) THEN END;
   WriteInt(history, Settings.FontSize);
   WriteInt(history, body.num);
 END Save;
 PROCEDURE ReadInt(VAR x: INTEGER);
 BEGIN
-  IF Read.Int(history, x) THEN END
+  IF File.ReadInt(history, x) THEN END
 END ReadInt;
 		ReadInt(n);
 		WHILE n > 0 DO
 			ReadInt(num);
 			ref := XML.GetTagByNum(num);
 			IF ref # NIL THEN
-				PushRef(ref);
+				setVisited(ref);
-				ref.Visited := TRUE
+				ref.Visited := TRUE;
+				PushRef(ref)
 			END;
 			DEC(n)
 		END
 	END ReadRef;
   ReadInt(Settings.PADDING.Top);
   ReadInt(Settings.PADDING.CInt);
   ReadInt(Settings.PARAGRAPH);
   ReadInt(Settings.EPIGRAPH);
   ReadInt(Settings.InterLin);
-  IF Read.Boolean(history, Settings.TwoCol) THEN END;
+  IF File.ReadBool(history, Settings.TwoCol) THEN END;
   ReadInt(Settings.FontSize);
   SetSettings(Settings);
   ReadRef;
   ReadInt(size);
   pos := File.Seek(history, -size, 1);
   pos := File.Seek(history, 4, 1);
-  IF Write.Char(history, 1X) THEN END;
+  IF File.WriteChar(history, 1X) THEN END;
   Ycur := ycur;
   body := XML.GetTagByNum(body_num);
   found := FALSE;
   history := File.Open(Ini.History);
   pos := File.Seek(history, -4, 2);
   last := FALSE;
   WHILE pos >= 0 DO
-    IF Read.Int(history, size) THEN
+    IF File.ReadInt(history, size) THEN
       pos := File.Seek(history, -size + 4, 1);
     END;
-    IF Read.Char(history, c) THEN END;
+    IF File.ReadChar(history, c) THEN END;
     ReadInt(fsize);
     ReadInt(_chksum);
     IF (c = 0X) & (fsize = fsize2) & (_chksum = chksum) THEN
       found := TRUE;
-      IF Read.Int(history, x) & Read.Int(history, y) THEN
+      IF File.ReadInt(history, x) & File.ReadInt(history, y) THEN
         win_size_x := x;
         win_size_y := y;
       ELSE
         found := FALSE
       END;
         ReadInt(Settings.PADDING.Top);
         ReadInt(Settings.PADDING.CInt);
         ReadInt(Settings.PARAGRAPH);
         ReadInt(Settings.EPIGRAPH);
         ReadInt(Settings.InterLin);
-        IF Read.Boolean(history, Settings.TwoCol) THEN END;
+        IF File.ReadBool(history, Settings.TwoCol) THEN END;
         ReadInt(Settings.FontSize);
       END;
       pos := File.Seek(history, pos - 8, 0)
     END
   END;
   done := FALSE;
   loaded := FALSE;
   FilePath := FName;
   FileName := FName;
   S.GetPath(FilePath);
-  W  := ColLeft.Width;
+  W  := ColLeft.width;
   W1 := W;
-  W2 := ColLeft.Width + ColRight.Width + Settings.PADDING.ColInter;
+  W2 := ColLeft.width + ColRight.width + Settings.PADDING.ColInter;
-  Lines := ColLeft.Height DIV LineH;
+  Lines := ColLeft.height DIV LineH;
-  ColLeft.Height := Lines * LineH;
+  ColLeft.height := Lines * LineH;
   PID := SU.NewThread(Start, Stack);
   WHILE ~SU.IsTerminated(PID) DO
     event := SU.CheckEvent();
     IF event = 3 THEN
       SU.TerminateThreadId(PID);

Subversion Repositories Kolibri OS

(root)/programs/other/fb2reader/SRC/DOM.ob07 – Rev 9896 → 9898