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

     tText* = POINTER TO RECORD (List.tList)
         cursor, select, select2: pPoint;
         scroll: tPoint;
         CurX: INTEGER;
         smallChange: INTEGER;
-        modified*, smallMove: BOOLEAN;
+        modified*, smallMove,
-        edition*: tGuard;
-        comments, numbers*, guard,
+        comments, guard,
         search, cs, whole: BOOLEAN;
+        edition*: tGuard;
         curLine: tLine;
         lang*: INTEGER;
         enc, eol: INTEGER;
         table: Search.IdxTable;
         foundList: List.tList;
 VAR
     pdelete: PROCEDURE (text: tText);
     ShowCursor: PROCEDURE;
-    colors*: RECORD
+    colors: RECORD
                 text, back, seltext, selback, modified, saved, curline, numtext, numback: INTEGER;
                 comment, string, escape, num, delim, key1, key2, key3: INTEGER
              END;
     canvas: G.tCanvas;
     drawCursor: BOOLEAN;
     padding: RECORD left, top: INTEGER END;
+    size, textsize: tPoint;
-    size, textsize: tPoint;
+    charWidth, charHeight: INTEGER;
-    charWidth, charHeight: INTEGER;
+    autoIndents*, lineNumbers*, autoBrackets*, trimSpace*: BOOLEAN;
     rigth := size.X - 1;
     bottom := top + size.Y - 1;
 END getTextRect;
-PROCEDURE toggleNumbers* (text: tText);
+PROCEDURE toggleNumbers*;
 BEGIN
+    lineNumbers := ~lineNumbers
+END toggleNumbers;
+PROCEDURE toggleIndents*;
+BEGIN
+    autoIndents := ~autoIndents
+END toggleIndents;
+PROCEDURE toggleBrackets*;
+BEGIN
+    autoBrackets := ~autoBrackets
+END toggleBrackets;
+PROCEDURE toggleTrimSpace*;
+BEGIN
-    text.numbers := ~text.numbers
+    trimSpace := ~trimSpace
-END toggleNumbers;
+END toggleTrimSpace;
         resetSelect(text);
         curLine := text.curLine;
         IF text.cursor.X > 0 THEN
         	INC(text.smallChange);
             i := text.cursor.X;
+            IF autoIndents THEN
-            n := leadingSpaces(curLine);
+	            n := leadingSpaces(curLine)
+            ELSE
+    	        n := 0
+            END;
             modify(text);
             IF n < i THEN
                 move(text, -1);
                 delete(text)
             ELSE
     END;
     List._insert(text, curLine, newLine);
     SetPos(text, 0, text.cursor.Y + 1);
     line := text.curLine.prev(tLine);
     n := -1;
-    WHILE (line # NIL) & (n = -1) DO
+    WHILE (line # NIL) & (n = -1) & autoIndents DO
         IF (*line.length*)Lines.trimLength(line) # 0 THEN
             n := leadingSpaces(line);
             line2 := line
         END;
         PrevLine(line)
     		INC(text.smallChange)
     	END;
         delSelect(text);
         curLine := text.curLine;
         Lines.insert(curLine, text.cursor.X, WCHR(code));
+        IF autoBrackets THEN
+        	IF code = ORD("(") THEN
+        		code := ORD(")")
+        	ELSIF code = ORD("[") THEN
+        		code := ORD("]")
+        	ELSIF code = ORD("{") THEN
+        		code := ORD("}")
+        	ELSE
+        		code := -1
+        	END;
+        	IF code # -1 THEN
+        		Lines.insert(curLine, text.cursor.X + 1, WCHR(code))
+        	END
+        END;
         Lines.modify(curLine);
         modify(text);
         SetPos(text, text.cursor.X + 1, text.cursor.Y)
     ELSIF code = 8 THEN
 		BkSpace(text)
     tempFile = "/tmp0/1/cedit~.tmp";
 VAR
     line: tLine;
     file: RW.tOutput;
     res: BOOLEAN;
+    Len: INTEGER;
 BEGIN
     ChangeLog.setGuard(text.edition);
     file := RW.create(tempFile, text.enc, text.eol);
     IF file # NIL THEN
         ChangeLog.delSaved;
         line := text.first(tLine);
         WHILE line # NIL DO
+        	IF trimSpace THEN
+        		Len := Lines.trimLength(line)
+        	ELSE
+        		Len := line.length
+        	END;
-            RW.putString(file, line, Lines.trimLength(line));
+            RW.putString(file, line, Len);
             NextLine(line);
             IF line # NIL THEN
                 RW.newLine(file)
             END
         END;
     G.SetColor(canvas, colors.back);
     IF ~text.smallMove THEN
     	G.clear(canvas)
     END;
     wNum := charWidth;
-    IF text.numbers THEN
+    IF lineNumbers THEN
         numWidth := U.lg10(text.count) + 2;
         xNum := numWidth*wNum - wNum DIV 2;
         setPadding(numWidth*wNum + pad_left, padding.top);
     ELSE
         setPadding(pad_left + wNum*2, padding.top)
     line := firstLine;
     SetColor(colors.numtext, colors.numback);
     y := padding.top + inter DIV 2;
     n := MIN(text.scroll.Y + textsize.Y, text.count);
     FOR i := text.scroll.Y + 1 TO n DO
-        IF text.numbers THEN
+        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);
     IF text.searchText # "" THEN
     	IF text.smallMove THEN
     		firstLine := text.curLine;
     		lastLine := firstLine
     	ELSE
-    	    lastLine := getLine2(text, text.scroll.Y + textsize.Y - 1)
+    	    lastLine := getLine2(text, MIN(text.scroll.Y + textsize.Y, text.count) - 1)
         END;
         p := text.foundList.first(Search.tPos);
         WHILE p # NIL DO
         	y := padding.top + inter DIV 2;
         	IF text.smallMove THEN
     text.smallMove := FALSE;
     text.comments := TRUE;
     text.search := TRUE;
     text.cs := FALSE;
     text.whole := FALSE;
-    text.numbers := TRUE;
     text.guard := TRUE;
     text.edition := NIL;
     text.foundList := List.create(NIL);
     text.searchText := "";
     text.foundSel := 0;
     resetSelect(text)
     RETURN text
 END New;
-PROCEDURE init* (pShowCursor: tProcedure);
+PROCEDURE init* (pShowCursor: tProcedure; _lineNumbers, _autoIndents, _autoBrackets, _trimSpace: BOOLEAN);
 BEGIN
     ShowCursor := pShowCursor;
+    pdelete := delete;
+    drawCursor := TRUE;
+    lineNumbers := _lineNumbers;
+    autoIndents := _autoIndents;
-    pdelete := delete;
+    autoBrackets := _autoBrackets;
-    drawCursor := TRUE;
+    trimSpace := _trimSpace;
     padding.left := pad_left;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/Text.ob07 – Rev 9668 → 9671