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

         INC(i)
     END
 END parse;
+PROCEDURE plain (text: tText; textStart, textEnd: tPoint; _copy: BOOLEAN): CB.tBuffer;
+VAR
-PROCEDURE plain (text: tText): CB.tBuffer;
+	first, line: tLine;
+	cnt, n: INTEGER;
+	buffer: CB.tBuffer;
-VAR
+	PROCEDURE append (buffer: CB.tBuffer; line: tLine; first, last: INTEGER; _copy: BOOLEAN);
+	BEGIN
+		IF first <= last THEN
+			CB.append(buffer, line, first, last)
+		ELSE
+			IF (U.OS = "KOS") & _copy THEN
+				CB.appends(buffer, SPACE, 0, 0)
-    buf: CB.tBuffer;
+			END
+		END
+	END append;
     size: INTEGER;
-    line: tLine;
+BEGIN
-BEGIN
+	IF ~_copy THEN
-    size := 0;
+		cnt := -lenEOL;
+		line := text.first(tLine);
-    line := text.first(tLine);
+		WHILE line # NIL DO
-    WHILE line # NIL DO
+			INC(cnt, lenEOL);
-        line.pos := size;
+			line.pos := cnt;
-        INC(size, line.length);
-        NextLine(line);
-        IF line # NIL THEN
+			INC(cnt, line.length);
-            INC(size, CB.lenEOL)
+			NextLine(line)
+		END
-        END
+	END;
-    END;
+	first := getLine2(text, textStart.Y);
+	line := first;
-    buf := CB.create(size + 2);
+	n := textEnd.Y - textStart.Y;
+	cnt := 0;
-    line := text.first(tLine);
+	WHILE n >= 0 DO
+		INC(cnt, line.length + lenEOL);
+		IF (U.OS = "KOS") & _copy & (line.length = 0) THEN
-    WHILE line # NIL DO
+			INC(cnt)
-        CB.append(buf, line, 0, line.length - 1);
-        NextLine(line);
-        IF line # NIL THEN
+		END;
-            CB.eol(buf)
+		NextLine(line);
+		DEC(n)
+	END;
-        END
+	buffer := CB.create(cnt + 2); (* +2 wchars EOT *)
+	n := textEnd.Y - textStart.Y;
+	line := first;
+	IF n = 0 THEN
+		append(buffer, line, textStart.X, textEnd.X - 1, _copy)
+	ELSE
+		append(buffer, line, textStart.X, line.length - 1, _copy);
-    END;
+		REPEAT
+			DEC(n);
+			CB.eol(buffer);
+			NextLine(line);
+			IF n > 0 THEN
+				append(buffer, line, 0, line.length - 1, _copy)
+			END
+		UNTIL n = 0;
+		append(buffer, line, 0, textEnd.X - 1, _copy)
-    CB.appends(buf, 0X, 0, 0);
+	END
     CB.appends(buf, 0X, 0, 0)
-    RETURN buf
+	RETURN buffer
 END plain;
-PROCEDURE search* (text: tText; s: ARRAY OF WCHAR; cs, whole: BOOLEAN): BOOLEAN;
+PROCEDURE _search (text: tText; s: ARRAY OF WCHAR; cs, whole: BOOLEAN; textStart, textEnd: tPoint): BOOLEAN;
+VAR
+	pos: List.tItem;
-VAR
+	res: BOOLEAN;
-	pos: List.tItem;
+	plainText, idxData: CB.tBuffer;
-	res: BOOLEAN;
+	first: tLine;
 	plainText, idxData: Search.tBuffer;
 BEGIN
 	text.searchText := s;
 	IF ~cs THEN
 		U.lowcase(text.searchText)
 	END;
 	IF text.searchText # "" THEN
+		first := getLine2(text, textStart.Y);
-		plainText := plain(text);
+		plainText := plain(text, textStart, textEnd, FALSE);
+		CB.appends(plainText, 0X, 0, 0);
+		CB.appends(plainText, 0X, 0, 0);
 		idxData := Search.index(plainText, cs);
-		Search.find(plainText, text.searchText, whole, text.foundList);
+		Search.find(plainText, text.searchText, whole, text.foundList, first.pos + textStart.X);
 		res := text.foundList.count > 0
 	ELSE
 		Search.close
 	END;
 	CB.destroy(plainText);
 	CB.destroy(idxData);
 	text.search := FALSE;
 	text.foundSel := 0
 	RETURN res
+END _search;
+PROCEDURE search* (text: tText; s: ARRAY OF WCHAR; cs, whole: BOOLEAN): BOOLEAN;
+VAR
+	textStart, textEnd: tPoint;
+(*
+	PROCEDURE _getSelect (text: tText; VAR selBeg, selEnd: tPoint);
+	BEGIN
+	    selBeg := text.cursor^;
+	    selEnd := text.select^;
+	    IF (selBeg.Y > selEnd.Y) OR (selBeg.Y = selEnd.Y) & (selBeg.X > selEnd.X) THEN
+	        selBeg := text.select^;
+	        selEnd := text.cursor^
+	    END
+	END _getSelect;*)
+BEGIN
+	textStart.Y := 0; textStart.X := 0;
+	textEnd.Y := text.count - 1; textEnd.X := text.last(tLine).length;
+	//_getSelect(text, textStart, textEnd)
+	RETURN _search(text, s, cs, whole, textStart, textEnd)
 END search;
 		lines := 0
 	END
 END getSelCnt;
-PROCEDURE copy (text: tText);
+PROCEDURE Copy (text: tText);
-VAR
-    selBeg, selEnd: tPoint;
-    first, line: tLine;
+VAR
-    cnt, n: INTEGER;
-    buffer: CB.tBuffer;
-    PROCEDURE append (buffer: CB.tBuffer; line: tLine; first, last: INTEGER);
-    BEGIN
-        IF first <= last THEN
-            CB.append(buffer, line, first, last)
-        ELSE
-            IF U.OS = "KOS" THEN
-                CB.appends(buffer, SPACE, 0, 0)
-            END
-        END
-    END append;
 	selStart, selEnd: tPoint;
+	buffer: CB.tBuffer;
-BEGIN
-    getSelect(text, selBeg, selEnd);
+BEGIN
-    first := getLine2(text, selBeg.Y);
-    line := first;
-    n := selEnd.Y - selBeg.Y;
-    cnt := 0;
-    WHILE n >= 0 DO
-        INC(cnt, line.length + (lenEOL + ORD(U.OS = "KOS")));
-        NextLine(line);
-        DEC(n)
-    END;
-    buffer := CB.create(cnt + 2); (* +2 wchars EOT *)
-    n := selEnd.Y - selBeg.Y;
-    line := first;
-    IF n = 0 THEN
-        append(buffer, line, selBeg.X, selEnd.X - 1)
-    ELSE
-        append(buffer, line, selBeg.X, line.length - 1);
-        REPEAT
-            DEC(n);
-            CB.eol(buffer);
-            NextLine(line);
-            IF n > 0 THEN
-                append(buffer, line, 0, line.length - 1)
-            END
-        UNTIL n = 0;
-        append(buffer, line, 0, selEnd.X - 1)
+	getSelect(text, selStart, selEnd);
-    END;
+	buffer := plain(text, selStart, selEnd, TRUE);
     CB.eot(buffer);
     CB.put(buffer);
     CB.destroy(buffer)
-END copy;
+END Copy;
 		END
 	END
 END MoveLines;
-PROCEDURE isWordChar (c: WCHAR): BOOLEAN;
-    RETURN U.isLetter(c) OR U.isDigit(c) OR (c = "_")
-END isWordChar;
 PROCEDURE getSelectedText* (text: tText; VAR s: ARRAY OF WCHAR);
 VAR
     n: INTEGER;
 	    ELSE
 	        str := ""
 	    END;
 	    IF str # "" THEN
 	        i := 0;
-	        WHILE (i < n) & isWordChar(str[i]) DO
+	        WHILE (i < n) & U.isWordChar(str[i]) DO
 	            INC(i)
 	        END;
 	        IF (i # n) OR
-	            ((x1 > 0) & isWordChar(Lines.getChar(curLine, x1 - 1))) OR
+	            ((x1 > 0) & U.isWordChar(Lines.getChar(curLine, x1 - 1))) OR
-	            ((x2 < curLine.length) & isWordChar(Lines.getChar(curLine, x2))) THEN
+	            ((x2 < curLine.length) & U.isWordChar(Lines.getChar(curLine, x2))) THEN
 	            str := ""
 	        END
 	    END;
 	    IF text.searchText # str THEN
 	    	text.smallMove := FALSE
 PROCEDURE getWordPos (line: tLine; pos: INTEGER): INTEGER;
 VAR
 	c: WCHAR;
 BEGIN
 	c := Lines.getChar(line, pos);
-	IF isWordChar(c) THEN
+	IF U.isWordChar(c) THEN
-		WHILE (pos < line.length) & isWordChar(Lines.getChar(line, pos)) DO
+		WHILE (pos < line.length) & U.isWordChar(Lines.getChar(line, pos)) DO
 			INC(pos)
 		END
 	ELSIF Lines.isSpace(c) THEN
 		WHILE (pos < line.length) & Lines.isSpace(Lines.getChar(line, pos)) DO
 			INC(pos)
 		END
 	ELSE
-		WHILE (pos < line.length) & ~Lines.isSpace(Lines.getChar(line, pos)) & ~isWordChar(Lines.getChar(line, pos)) DO
+		WHILE (pos < line.length) & ~Lines.isSpace(Lines.getChar(line, pos)) & ~U.isWordChar(Lines.getChar(line, pos)) DO
 			INC(pos)
 		END
 	END
 	RETURN pos
 END getWordPos;
             ShowCursor
         END
     |ORD("C"), ORD("X"):
         IF ctrl THEN
             IF selected(text) THEN
-                copy(text);
+                Copy(text);
                 IF code = ORD("X") THEN
                 	delSelect(text)
                 END
             END
         END
 BEGIN
     resetSelect(text);
     cursorX := text.cursor.X;
     line := text.curLine;
     x1 := cursorX - 1;
-    IF (cursorX < line.length) & isWordChar(Lines.getChar(line, cursorX)) THEN
+    IF (cursorX < line.length) & U.isWordChar(Lines.getChar(line, cursorX)) THEN
         x2 := cursorX;
-        WHILE (x2 < line.length) & isWordChar(Lines.getChar(line, x2)) DO
+        WHILE (x2 < line.length) & U.isWordChar(Lines.getChar(line, x2)) DO
             INC(x2)
         END
     ELSE
-        WHILE (x1 >= 0) & ~isWordChar(Lines.getChar(line, x1)) DO
+        WHILE (x1 >= 0) & ~U.isWordChar(Lines.getChar(line, x1)) DO
             DEC(x1)
         END;
         x2 := x1 + 1
     END;
-    WHILE (x1 >= 0) & isWordChar(Lines.getChar(line, x1)) DO
+    WHILE (x1 >= 0) & U.isWordChar(Lines.getChar(line, x1)) DO
         DEC(x1)
     END;
     INC(x1);
     IF x1 < x2 THEN
         SetPos(text, x1, text.cursor.Y);

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/Text.ob07 – Rev 9906 → 9907