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 (28-sep-2021)";
+    HEADER = "CEdit (03-oct-2021)";
     ShellFilter = "";
-    EditFilter = "SH|ASM|TXT|INC|OB07|C|CPP|H|PAS|PP|LUA|INI|JSON";
+    EditFilter = "SH|INC|TXT|ASM|OB07|C|CPP|H|PAS|PP|LUA|INI|JSON";
     btnBuild = 28;
     btnRun = 29;
     btnYes = 40;
     btnNo = 41;
-    btnFindNext = 60;
+    btnFindNext = 42;
-    btnReplace = 61;
+    btnReplace = 43;
-    btnReplaceAll = 62;
+    btnReplaceAll = 44;
-    btnGoto = 63;
+    btnGoto = 45;
-    btnCloseSearch = 64;
+    btnCloseSearch = 46;
-    btnHideSearch = 65;
+    btnHideSearch = 47;
-    mainMenuBtn = 70;
+    mainMenuBtn = 60;
     btnHeight = 25;
     OD: OpenDlg.Dialog;
     confirm, notFound, menuFindClicked, search, searchOpened, modified: BOOLEAN;
     switch, closing: BOOLEAN;
-    leftButton: BOOLEAN;
-    hScroll, vScroll: Scroll.tScroll;
+    leftButton: BOOLEAN;
     LEFT: INTEGER;
     FindEdit, ReplaceEdit, GotoEdit: EB.tEditBox;
-    FindEdit, ReplaceEdit, GotoEdit: EB.tEditBox;
+    hScroll, vScroll: Scroll.tScroll;
     CS, WH, BKW: CheckBox.tCheckBox;
     K.DrawText(LEFT, y, K.textColor, s1)
 END WritePos;
-PROCEDURE EditBox_Focus (edit: EB.tEditBox): BOOLEAN;
-VAR
-	res: BOOLEAN;
-BEGIN
-	res := FALSE;
-	IF edit # NIL THEN
-	    res := 1 IN edit.flags
-	END
+PROCEDURE EditBox_Focus (edit: EB.tEditBox): BOOLEAN;
-	RETURN res
+	RETURN 1 IN edit.flags
 END EditBox_Focus;
 		Timer.create(mainTID)
 	END
 END resetTimer;
-PROCEDURE EditBox_SetFocus (edit: EB.tEditBox; value: BOOLEAN);
+PROCEDURE EditBox_SetFocus (VAR edit: EB.tEditBox; value: BOOLEAN);
 BEGIN
     IF value THEN
     	INCL(edit.flags, 1)
         EB.paint(edit)
     END
 END EditBox_SetFocus;
-PROCEDURE SetFocus (edit: EB.tEditBox; value: BOOLEAN);
+PROCEDURE SetFocus (VAR edit: EB.tEditBox; value: BOOLEAN);
 BEGIN
     EditBox_SetFocus(FindEdit, FALSE);
     EditBox_SetFocus(ReplaceEdit, FALSE);
 PROCEDURE DrawState (text: T.tText; width, height: INTEGER);
 VAR
     y: INTEGER;
+    s: ARRAY 24 OF WCHAR;
-    s: ARRAY 24 OF WCHAR;
+    header: RW.tFileName;
-BEGIN
-    y := (btnHeight - fontHeight) DIV 2 + btnTop;
+BEGIN
     s := "";
     U.append(s, RW.eolNames[text.eol]);
-    U.append(s, 20X);
+    U.append(s, 20X + 20X);
+    U.append(s, E.names[text.enc]);
+    header := HEADER;
+    IF text.fileName # "" THEN
-    U.append(s, E.names[text.enc]);
+    	U.append8(header, " - ");
+    	U.append8(header, text.fileName)
+    END;
-    K.DrawRect(width - LEN(s)*fontWidth, y, LEN(s)*fontWidth, fontHeight, K.winColor);
+    K.SetCaption(header);
-    K.DrawText(width - LENGTH(s)*fontWidth, y, K.textColor, s);
+    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.DrawRect(LEFT + 16*fontWidth, TOP + canvas.height + scrollWidth, width - LEFT - 24*fontWidth, BOTTOM - scrollWidth + 1, K.winColor);
+    y := height - (BOTTOM - scrollWidth) + (BOTTOM - scrollWidth - 16) DIV 2;
-    K.DrawText866(LEFT + 16*fontWidth, y, K.textColor, text.fileName);
+    K.DrawText(width - (LENGTH(s) + 10)*fontWidth, y, K.textColor, s);
     WriteModified(width - 8*fontWidth, y)
 END DrawState;
     END drawToolbarBtn;
 BEGIN
     K.BeginDraw;
-    K.CreateWindow(30 + K.GetTickCount() MOD 128, 30 + K.GetTickCount() MOD 128, winWidth, winHeight, K.winColor, 73H, 0, 0, header);
+    K.CreateWindow(30 + K.GetTickCount() MOD 128, 30 + K.GetTickCount() MOD 128, winWidth, winHeight, K.winColor, 73H, 0, 0, "");
     IF (text # NIL) & ~K.RolledUp() THEN
     	IF confirm THEN
     		resetTimer
 BEGIN
     OD._type := OpenDlg.tsave;
     U.getFileName(text.fileName, OD.FileName, U.SLASH);
     IF OD.FileName = "" THEN
         OD.FileName := "NewFile.";
-        CASE text.lang OF
-        |Languages.langText:   ext := "txt"
+        Languages.getExt(text.lang, ext);
-        |Languages.langC:      ext := "c"
-        |Languages.langFasm:   ext := "asm"
-        |Languages.langIni:    ext := "ini"
-        |Languages.langJSON:   ext := "json"
-        |Languages.langLua:    ext := "lua"
-        |Languages.langOberon: ext := "ob07"
-        |Languages.langPascal: ext := "pas"
-        END;
         U.append8(OD.FileName, ext)
     END;
     OpenFile(fileName, EditFilter);
     IF fileName # "" THEN
         IF T.save(text, fileName) THEN
         error("'cedit: too many files' -E")
     END
 END open;
-PROCEDURE createEdit (left, top: INTEGER): EB.tEditBox;
-VAR
-    edit, EditBox0: EB.tEditBox;
-BEGIN
-    NEW(EditBox0);
-    EditBox0.text := K.malloc(EDITBOX_MAXCHARS + 2);
-    ASSERT(EditBox0.text # 0);
-    edit := EB.create(left, top, EditBox_Width, EDITBOX_MAXCHARS, EditBox0);
-    edit.flags := {1, 14};
-    edit.text_color := 30000000H;
-    EditBox_SetFocus(edit, FALSE)
-    RETURN edit
-END createEdit;
 PROCEDURE createSearchForm;
 BEGIN
-    FindEdit := createEdit(searchLeft, TOP + 20);
+	EB.create(searchLeft, TOP + 20, EditBox_Width, EDITBOX_MAXCHARS, FindEdit);
-    ReplaceEdit := createEdit(searchLeft, TOP + 20 + 55);
+	EB.create(searchLeft, TOP + 20 + 55, EditBox_Width, EDITBOX_MAXCHARS, ReplaceEdit);
-    GotoEdit := createEdit(searchLeft, TOP + 20 + 330);
+    EB.create(searchLeft, TOP + 20 + 330, EditBox_Width, EDITBOX_MAXCHARS, GotoEdit);
     INCL(GotoEdit.flags, 15);
     CheckBox.create("backward", BKW);
     CheckBox.create("match case", CS);
     Menu.close(context)
 END CloseMenu;
+PROCEDURE MenuItemClick (menu: Menu.tMenu; id: INTEGER);
 VAR
+	msg: ARRAY 2 OF INTEGER;
+BEGIN
-PROCEDURE MenuItemClick (menu: Menu.tMenu; id: INTEGER);
+	msg[0] := id;
-BEGIN
+	msg[1] := 8;
-    K.SendIPC(mainTID, id)
+    K.SendIPC(mainTID, msg)
 END MenuItemClick;
 CONST
     DELAY = 10;
 VAR
     msState: SET;
     scroll, x, y, scrollX, scrollY: INTEGER;
+    pos1, pos2: T.tPoint;
-    PROCEDURE EditBox (eb: EB.tEditBox);
+    PROCEDURE EditBox (VAR eb: EB.tEditBox);
     VAR
         focus: BOOLEAN;
     BEGIN
             T.scroll(text, 0, scroll*3);
             repaint
         END;
         IF leftButton THEN
             IF K.GetTickCount() - time >= DELAY THEN
+            	T.getPos(text, pos1.Y, pos1.X);
                 mouse(x, y);
                 T.mouse(text, x, y);
+                T.getPos(text, pos2.Y, pos2.X);
+                IF (pos1.X # pos2.X) OR (pos1.Y # pos2.Y) THEN
-                repaint
+                	repaint
-            END
+                END
+            END
         END;
 		Scroll.mouse(hScroll);
 		Scroll.mouse(vScroll);

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9208 → 9210