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

     CB := Clipboard, Languages,
     ChangeLog, Scroll, CheckBox,
     RW, Ini, EB := EditBox, Icons, Tabs, Timer;
 CONST
-    HEADER = "CEdit (27-nov-2021)";
+    HEADER = "CEdit (08-dec-2021)";
     ShellFilter = "";
     END;
     drawIcon(ico, 53, x)
 END toolbarIcons;
+PROCEDURE getIdx (text: T.tText): INTEGER;
 VAR
-PROCEDURE WriteModified (x, y: INTEGER);
+    i: INTEGER;
-BEGIN
-    modified := text.modified;
+BEGIN
-    K.DrawRect(x, TOP + canvas.height + scrollWidth, 8*fontWidth, BOTTOM - scrollWidth + 1, K.winColor);
+    i := 0;
-    IF modified THEN
+    WHILE texts[i] # text DO
+        INC(i)
+    END
+    RETURN i
+END getIdx;
+PROCEDURE MarkModified;
+BEGIN
-        K.DrawText866(x, y, K.textColor, "modified")
+    modified := text.modified;
+    Tabs.modify(tabs, getIdx(text), modified)
+END MarkModified;
+PROCEDURE SetCaption (fileName: RW.tFileName);
+VAR
+	header: RW.tFileName;
+BEGIN
+    header := HEADER;
+    IF text.fileName # "" THEN
+    	U.append8(header, " - ");
+    	U.append8(header, text.fileName)
+    END;
-    END
+    K.SetCaption(header)
-END WriteModified;
+END SetCaption;
-PROCEDURE DrawState (text: T.tText; width, height: INTEGER);
-VAR
+PROCEDURE DrawState (text: T.tText; width, height: INTEGER);
-    y: INTEGER;
+VAR
-    s: ARRAY 24 OF WCHAR;
+    y: INTEGER;
-    header: RW.tFileName;
+    s: ARRAY 24 OF WCHAR;
 BEGIN
 	eol := T.getEol(text);
 	enc := T.getEnc(text);
-    s := "";
-    U.append(s, RW.eolNames[eol]);
-    U.append(s, 20X + 20X);
-    U.append(s, E.names[enc]);
-    header := HEADER;
-    IF text.fileName # "" THEN
+    s := "";
-    	U.append8(header, " - ");
+    U.append(s, RW.eolNames[eol]);
-    	U.append8(header, text.fileName)
+    U.append(s, 20X + 20X);
-    END;
+    U.append(s, E.names[enc]);
-    K.SetCaption(header);
+    SetCaption(text.fileName);
     K.DrawRect(LEFT + 16*fontWidth, TOP + canvas.height + scrollWidth, width - (LEFT + 16*fontWidth), BOTTOM - scrollWidth + 1, K.winColor);
     y := height - (BOTTOM - scrollWidth) + (BOTTOM - scrollWidth - 16) DIV 2;
-    K.DrawText(width - (LENGTH(s) + 10)*fontWidth, y, K.textColor, s);
+    K.DrawText(width - LENGTH(s)*fontWidth, y, K.textColor, s);
         WritePos(y);
         IF (enc # T.getEnc(text)) OR (eol # T.getEol(text)) THEN
         	DrawState(text, width, height)
         ELSIF modified # text.modified THEN
-            WriteModified(width - 8*fontWidth, y)
+            MarkModified
         END;
         T.getScroll(text, scrollX, scrollY);
     resetTimer
 END OpenFile;
+PROCEDURE error (s: RW.tFileName);
 VAR
+    temp: RW.tFileName;
+BEGIN
+	temp := "'CEdit: ";
-PROCEDURE error (s: RW.tFileName);
+	U.append8(temp, s);
-BEGIN
+	U.append8(temp, "' -E");
-    K.Run("/rd/1/@notify", s)
+    K.Run("/rd/1/@notify", temp)
 END error;
 PROCEDURE saveError (name: RW.tFileName);
 VAR
-    s: RW.tFileName;
-BEGIN
+    s: RW.tFileName;
-    s := "'cedit: error saving file ";
+BEGIN
-    U.append8(s, name);
+    s := "error saving file ";
         END
     END
 END saveAs;
-PROCEDURE getIdx (text: T.tText): INTEGER;
-VAR
-    i: INTEGER;
-BEGIN
-    i := 0;
-    WHILE texts[i] # text DO
-        INC(i)
-    END
-    RETURN i
-END getIdx;
 PROCEDURE Switch (txt: T.tText);
 BEGIN
     Tabs.switch(tabs, curText);
             END
         ELSE
             curText := getIdx(text);
             Switch(text);
             saveAs(text)
-        END
+        END;
+   		Tabs.modify(tabs, getIdx(text), text.modified)
     END
 END save;
 PROCEDURE saveAll;
+VAR
-VAR
+    i: INTEGER;
-    i: INTEGER;
+    txt: T.tText;
 BEGIN
+    i := textsCount - 1;
-    i := textsCount - 1;
+    WHILE i >= 0 DO
+    	txt := texts[i];
-    WHILE i >= 0 DO
+        IF txt.modified THEN
-        IF texts[i].modified THEN
+        	T.switch(txt);
-            save(texts[i])
+            save(txt)
         END;
+        DEC(i)
-        DEC(i)
+    END;
-    END;
+    T.switch(text)
 END saveAll;
     IF textsCount < maxTexts THEN
         nov := T.New();
         T.SetPos(nov, 0, 0);
         insert(textsCount, nov)
     ELSE
-        error("'cedit: too many files' -E")
+        error("too many files")
     END
 END NewFile;
         IF fileName # "" THEN
             n := getFileNum(fileName);
             IF n = -1 THEN
                 nov := T.open(fileName, err);
                 IF nov = NIL THEN
-                    error("'cedit: error opening file' -E")
+                    error("error opening file")
                 ELSE
                     insert(textsCount, nov);
                     T.SetPos(nov, 0, 0)
                 END
             ELSE
                 SwitchTab(n)
             END
         END
     ELSE
-        error("'cedit: too many files' -E")
+        error("too many files")
     END
 END open;
 PROCEDURE ShowSearchPanel (goto: BOOLEAN);
 VAR
 	i: INTEGER;
-	flag: BOOLEAN;
+	(*flag: BOOLEAN;*)
 BEGIN
-	flag := FALSE;
+	(*flag := FALSE;*)
 	IF T.selected(text) & ~goto THEN
 		T.getSelectedText(text, new_searchText);
 		IF new_searchText # "" THEN
 			END;
 			IF new_searchText[i] = 0X THEN
 				searchText := new_searchText;
 				EB.setValue(FindEdit, searchText);
 				notFound := ~T.search(text, searchText, cs, whole);
-				flag := TRUE
+				(*flag := TRUE*)
 			END
 		END
 	END;
     IF ~search THEN
         Search
     ELSIF ~searchOpened THEN
         search := FALSE;
         Search
     END;
-    IF flag THEN
-    	SetFocus(FindEdit, FALSE)
-    ELSIF goto THEN
+    IF goto THEN
-   		SetFocus(GotoEdit, TRUE)
+    	SetFocus(GotoEdit, TRUE)
     ELSE
-    	SetFocus(FindEdit, TRUE)
+    	SetFocus(FindEdit, (*~flag*)TRUE)
     END
 END ShowSearchPanel;
             key := -1;
             ShowSearchPanel(FALSE)
         ELSIF (keyCode = 34) & ctrl THEN (* ctrl+G *)
             key := -1;
             ShowSearchPanel(TRUE)
+        ELSIF (keyCode = 18) & ctrl THEN (* ctrl+E *)
+            key := -1;
+            T.selectWord(text)
         ELSE
             IF EditBox_Focus(FindEdit) THEN
             	IF keyCode = 15 THEN (* Tab *)
             		SetFocus(ReplaceEdit, TRUE)
             	ELSE
                 resize;
                 resized := TRUE
             END;
             K.SetEventsMask({0, 1, 2, 5, 6, 31})
         ELSE
+        	SetCaption(text.fileName);
             K.SetEventsMask({0, 30, 31})
         END;
         draw_window
     END
 END Redraw;
         text := T.New();
         filePath := "/rd/1"
     ELSE
         text := T.open(fileName, err);
         IF text = NIL THEN
-            error("'cedit: error opening file' -E");
+            error("error opening file");
             K.Exit
         ELSE
             U.getPath(fileName, filePath)
         END
     END;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9336 → 9410