WebSVN – Kolibri OS – Diff – /programs/develop/cedit/SRC/Text.ob07

     lenEOL = CB.lenEOL;
     mark_width = 2;
     pad_left = mark_width + 3;
     pad_top = 1;
-    inter = 2;
+    LineSpacing* = 2;
         edition*: tGuard;
         curLine: tLine;
         lang*: INTEGER;
         enc, eol: INTEGER;
         foundList: List.tList;
-        foundSel: INTEGER;
+        foundSel*, foundCur*, foundCnt*: INTEGER;
         searchText: tString;
         LinesVector: Lines.tVector;
         chLog*: ChangeLog.tLog;
         maxLength*: INTEGER;
         fileName*: RW.tFileName
 	    scrollX := text.scroll.X;
 	    scrollY := text.scroll.Y;
 	    IF ~((scrollY > cursor.Y) OR (scrollY + textsize.Y + 1 <= cursor.Y) OR
 	       (scrollX > cursor.X) OR (scrollX + textsize.X <= cursor.X)) THEN
 	        x := (cursor.X - scrollX)*charWidth + padding.left;
-	        y1 := (cursor.Y - scrollY)*charHeight + padding.top + (inter DIV 2 + 1);
+	        y1 := (cursor.Y - scrollY)*charHeight + padding.top + (LineSpacing DIV 2 + 1);
-	        y2 := y1 + charHeight - (inter + 2);
+	        y2 := y1 + charHeight - (LineSpacing + 2);
 	        G.notVLine(canvas, x, y1, y2);
 	        G.notVLine(canvas, x - 1, y1, y2)
 	    END
     END
 END cursor;
-    Len := MIN(Len, textsize.X - pos + 1);
+	Len := MIN(Len, textsize.X - pos + 1);
-    SetColor(colors.seltext, colors.selback);
+	SetColor(colors.seltext, colors.selback);
-    pos := MAX((selBeg - text.scroll.X), 0);
+	pos := MAX((selBeg - text.scroll.X), 0);
-    x := pos*charWidth + padding.left;
+	x := pos*charWidth + padding.left;
-    G.SetColor(canvas, colors.selback);
+	G.SetColor(canvas, colors.selback);
+	G.FillRect(canvas, x - 1, y - LineSpacing DIV 2,
-    G.FillRect(canvas, x - 1, y - inter DIV 2, x + Len*charWidth, y - inter DIV 2 + charHeight);
+		x + Len*charWidth, y - LineSpacing DIV 2 + charHeight);
-    G.TextOut(canvas, pos*charWidth + padding.left, y, Lines.getPChar(line, firstCharIdx), Len, colors.seltext)
+	G.TextOut(canvas, pos*charWidth + padding.left, y, Lines.getPChar(line, firstCharIdx), Len, colors.seltext)
 END drawSelect;
         setPadding(numWidth*wNum + pad_left, padding.top);
     ELSE
         setPadding(pad_left + wNum*2, padding.top)
     END;
     getSelect(text, selBeg, selEnd);
-    y := padding.top + inter DIV 2;
+    y := padding.top + LineSpacing DIV 2;
     n := text.scroll.Y;
     firstLine := getLine2(text, n);
     IF text.smallMove THEN
     	line := text.curLine;
     	cnt := textsize.Y;
     	y := y + charHeight*(text.cursor.Y - text.scroll.Y);
     	G.SetColor(canvas, colors.back);
+    	G.FillRect(canvas, padding.left - 2, y - LineSpacing DIV 2,
-    	G.FillRect(canvas, padding.left - 2, y - inter DIV 2, size.X - 1, y - inter DIV 2 + charHeight);
+    		size.X - 1, y - LineSpacing DIV 2 + charHeight);
     	n := text.cursor.Y
     ELSE
 	    line := firstLine;
     	cnt := 0
     END;
     WHILE (line # NIL) & (cnt <= textsize.Y) DO
         backColor := colors.back;
         IF (line = text.curLine) & ~selected(text) THEN
+            G.SetColor(canvas, colors.curline);
-            G.SetColor(canvas, colors.curline);
+            G.FillRect(canvas, padding.left - 2, y - LineSpacing DIV 2,
-            G.FillRect(canvas, padding.left - 2, y - inter DIV 2, size.X - 1, y - inter DIV 2 + charHeight);
+            	size.X - 1, y - LineSpacing DIV 2 + charHeight);
             backColor := colors.curline
         END;
         SetColor(colors.text, backColor);
         ELSIF (selBeg.Y = n) & (selEnd.Y # n) THEN
             drawSelect(text, line, selBeg.X, line.length, y)
         ELSIF (selBeg.Y # n) & (selEnd.Y = n) THEN
             drawSelect(text, line, 0, selEnd.X, y)
         END;
-        mark(line, y - inter DIV 2);
+        mark(line, y - LineSpacing DIV 2);
         NextLine(line);
         INC(y, charHeight);
         INC(n);
         INC(cnt)
     END;
     G.SetColor(canvas, colors.numback);
     G.FillRect(canvas, 0, 0, padding.left - pad_left (*+ 1*), size.Y - 1);
     line := firstLine;
     SetColor(colors.numtext, colors.numback);
-    y := padding.top + inter DIV 2;
+    y := padding.top + LineSpacing DIV 2;
     n := MIN(text.scroll.Y + textsize.Y + 1, text.count);
     FOR i := text.scroll.Y + 1 TO n DO
         IF lineNumbers THEN
             IF (i MOD 10 = 0) OR (i - 1 = text.cursor.Y) OR line.label THEN
                 U.int2str(i, s);
                 G.TextOut2(canvas, (numWidth - U.lg10(i) - 1)*wNum - wNum DIV 2, y, s, LENGTH(s))
             ELSE
                 G.SetColor(canvas, colors.numtext);
+                G.HLine(canvas, y - LineSpacing DIV 2 + charHeight DIV 2,
-                G.HLine(canvas, y - inter DIV 2 + charHeight DIV 2, xNum - wNum DIV (1 + ORD(i MOD 5 # 0)), xNum)
+                	xNum - wNum DIV (1 + ORD(i MOD 5 # 0)), xNum)
             END
         END;
         IF line.label THEN
             FOR x := wNum DIV 2 TO (padding.left - pad_left) - wNum DIV 2 DO
-                G.notVLine(canvas, x, y, y + charHeight - (inter + 1));
+                G.notVLine(canvas, x, y, y + charHeight - (LineSpacing + 1));
-                G.xorVLine(canvas, x, y, y + charHeight - (inter + 1))
+                G.xorVLine(canvas, x, y, y + charHeight - (LineSpacing + 1))
             END
         END;
         NextLine(line);
         INC(y, charHeight)
         i := 0;
         p := text.foundList.first(Search.tPos);
         pos := Search.next(p, i);
         WHILE pos # -1 DO
-        	y := padding.top + inter DIV 2;
+        	y := padding.top + LineSpacing DIV 2;
         	IF text.smallMove THEN
         		y := y + charHeight*(text.cursor.Y - text.scroll.Y)
             END;
             IF (firstLine.pos <= pos) & (pos <= lastLine.pos + lastLine.length) THEN
                 END;
                 x := (pos - line.pos - text.scroll.X)*charWidth + padding.left;
                 n := LENGTH(text.searchText)*charWidth;
                 WHILE n > 0 DO
                     IF x >= padding.left THEN
-                        G.notVLine(canvas, x, y, y + charHeight - inter)
+                        G.notVLine(canvas, x, y, y + charHeight - LineSpacing)
                     END;
                     INC(x);
                     DEC(n)
                 END
             END;
     text.smallMove := FALSE;
     IF text.foundSel > 0 THEN
         x := (text.cursor.X - text.scroll.X)*charWidth + padding.left;
-        y := (text.cursor.Y - text.scroll.Y)*charHeight + padding.top + inter DIV 2;
+        y := (text.cursor.Y - text.scroll.Y)*charHeight + padding.top + LineSpacing DIV 2;
         n := text.foundSel*charWidth;
         WHILE n > 0 DO
             IF x >= padding.left THEN
-                G.xorVLine(canvas, x, y, y + charHeight - inter)
+                G.xorVLine(canvas, x, y, y + charHeight - LineSpacing)
             END;
             INC(x);
             DEC(n)
 PROCEDURE setCanvas* (_canvas: G.tCanvas);
 BEGIN
     canvas := _canvas;
     charWidth := _canvas.font.width;
-    charHeight := _canvas.font.height + inter
+    charHeight := _canvas.font.height + LineSpacing
 END setCanvas;
 PROCEDURE findNext* (text: tText; prev: BOOLEAN): BOOLEAN;
 VAR
-    cursorPos, x, y, X, Y, Len: INTEGER;
+	cursorPos, x, y, X, Y, Len: INTEGER;
-    line: tLine;
+	line: tLine;
-    res: BOOLEAN;
+	res: BOOLEAN;
-    pos, i, pos0: INTEGER;
+	pos, i, pos0, first, last, num, cnt: INTEGER;
-    p: Search.tPos;
+	p: Search.tPos;
 BEGIN
-    X := text.cursor.X;
+	X := text.cursor.X;
-    Y := text.cursor.Y;
+	Y := text.cursor.Y;
-    text.cursor.X := MIN(text.cursor.X, text.curLine.length);
+	text.cursor.X := MIN(text.cursor.X, text.curLine.length);
-    cursorPos := text.curLine.pos + text.cursor.X - ORD(prev) - ORD(~prev & (text.foundSel = 0));
+	cursorPos := text.curLine.pos + text.cursor.X - ORD(prev) - ORD(~prev & (text.foundSel = 0));
-    pos0 := -1;
+	pos0 := -1;
+	cnt := 0;
+	IF text.foundList.count # 0 THEN
+		p := text.foundList.first(Search.tPos);
+		first := p.pos[0];
+		WHILE p # NIL DO
+			INC(cnt, p.cnt);
+			p := p.next(Search.tPos)
+		END;
+		p := text.foundList.last(Search.tPos);
+		last := p.pos[p.cnt - 1]
+	ELSE
+		first := -1;
+		last := -1
+	END;
+	text.foundCnt := cnt;
+	num := 1;
-    i := 0;
+	i := 0;
-    p := text.foundList.first(Search.tPos);
+	p := text.foundList.first(Search.tPos);
-    pos := Search.next(p, i);
+	pos := Search.next(p, i);
-    WHILE (pos # -1) & (pos <= cursorPos) DO
+	WHILE (pos # -1) & (pos <= cursorPos) DO
-    	pos0 := pos;
+		pos0 := pos;
-    	pos := Search.next(p, i)
+		pos := Search.next(p, i);
+		INC(num)
-    END;
+	END;
-    IF prev THEN
+	IF prev THEN
-    	pos := pos0
+		pos := pos0;
+		DEC(num)
-    END;
+	END;
+	IF pos = -1 THEN
+		IF prev THEN
+			pos := last;
+			num := cnt
+		ELSE
+			pos := first;
+			num := 1
+		END
+	END;
-    res := pos # -1;
+	res := pos # -1;
-    IF res THEN
+	IF res THEN
-        y := 0;
+		y := 0;
-        line := text.first(tLine);
+		line := text.first(tLine);
-        WHILE (line.pos <= pos) & (line.next # NIL) DO
+		WHILE (line.pos <= pos) & (line.next # NIL) DO
-            text.scroll.X := MAX(x + Len - textsize.X + 3, 0)
+			text.scroll.X := MAX(x + Len - textsize.X + 3, 0)
-        ELSIF x < text.scroll.X THEN
+		ELSIF x < text.scroll.X THEN
-            text.scroll.X := MAX(x - 3, 0)
+			text.scroll.X := MAX(x - 3, 0)
-        END;
+		END;
-        SetPos(text, x, y);
+		SetPos(text, x, y);
-        text.foundSel := Len
+		text.foundSel := Len;
+		text.foundCur := num
-    ELSE
+	ELSE
-        SetPos(text, X, Y)
+		SetPos(text, X, Y);
+		text.foundCur := 0
-    END
+	END
-    RETURN res
+	RETURN res
 END findNext;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/Text.ob07 @ 9913 – Rev 9913 → 9915