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

 *)
 MODULE CEdit;
 IMPORT
-    OpenDlg, K := KolibriOS,
+    OpenDlg, K := KolibriOS, Args,
     U := Utils, Lines, Menu, List,
     G := Graph, T := Text, E := Encodings,
     CB := Clipboard, Languages,
     ChangeLog, Scroll, CheckBox,
     RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar;
 CONST
-    HEADER = "CEdit (08-jan-2022)";
+    HEADER = "CEdit (13-jan-2022)";
     text: T.tText;
     texts: ARRAY maxTexts OF T.tText;
     textsCount, curText: INTEGER;
+    winWidth, winHeight: INTEGER;
-    winWidth, winHeight: INTEGER;
+    SkinHeight: INTEGER;
     AppPath, runScript, buildScript, debugScript: RW.tFileName;
     OD: OpenDlg.Dialog;
     confirm, notFound, menuFindClicked, search, searchOpened: BOOLEAN;
     top := (canvas.height - height) DIV 2 + TOP;
     bottom := top + height - 1;
     right := left + width - 1;
     x := minWidth DIV 2 + left;
     y := (height - fontHeight) DIV 2 + top;
-    K.DrawRect(left, top, width, height, K.winColor);
+    K.DrawRect(left, top, width, height, K.colors.work);
-    Rect(left, top, right, bottom, K.borderColor);
+    Rect(left, top, right, bottom, K.colors.line);
-    K.DrawText(x, y, K.textColor, s);
+    K.DrawText(x, y, K.colors.work_text, s);
 END Message;
 	        CheckBox.paint(BKW);
 	        CheckBox.paint(CS);
 	        CheckBox.paint(WH);
         END;
-		G.SetColor(canvas, K.borderColor);
+		G.SetColor(canvas, K.colors.line);
 		G.VLine(canvas, 0, 0, canvas.height - 1);
         G.DrawCanvas(canvas, LEFT, TOP);
         NotFound;
         Replaced;
     y, right, bottom: INTEGER;
 BEGIN
     DEC(top, Tabs.tabHeight);
     right := left + EditBox_Width + SEARCH_PADDING*2;
     bottom := top + 395 + btnHeight + SEARCH_PADDING;
-    Rect(left, top, right, bottom, K.borderColor);
+    Rect(left, top, right, bottom, K.colors.line);
     K.CreateButton(btnCloseSearch, right - 20, top, 20, 20, 0EF999FH, "");
     K.DrawLine(right - 14, top + 5, right - 5, top + 14, 0FFFFFFH);
     K.DrawLine(right - 15, top + 5, right - 5, top + 15, 0FFFFFFH);
     K.DrawLine(right - 15, top + 6, right - 6, top + 15, 0FFFFFFH);
     K.DrawLine(right - 15, top + 14, right - 6, top + 5, 0FFFFFFH);
     K.DrawLine(right - 15, top + 15, right - 5, top + 5, 0FFFFFFH);
     K.DrawLine(right - 14, top + 15, right - 5, top + 6, 0FFFFFFH);
-    K.CreateButton(btnHideSearch, right - 40, top, 20, 20, K.btnColor, "");
+    K.CreateButton(btnHideSearch, right - 40, top, 20, 20, K.colors.button, "");
-    K.DrawLine(right - 34, top + 14, right - 26, top + 14, K.btnTextColor);
+    K.DrawLine(right - 34, top + 14, right - 26, top + 14, K.colors.button_text);
-    K.DrawLine(right - 34, top + 15, right - 26, top + 15, K.btnTextColor);
+    K.DrawLine(right - 34, top + 15, right - 26, top + 15, K.colors.button_text);
     INC(top, 15);
     INC(left, SEARCH_PADDING);
-    K.DrawText866(left, top, K.textColor, "find");
+    K.DrawText866(left, top, K.colors.work_text, "find");
-    K.DrawText866(left, top + 55, K.textColor, "replace with");
+    K.DrawText866(left, top + 55, K.colors.work_text, "replace with");
-    K.DrawText866(left, top + 330, K.textColor, "go to line");
+    K.DrawText866(left, top + 330, K.colors.work_text, "go to line");
     BKW.top := top + 110;
     BKW.left := left;
     GotoEdit.left := left;
     EB.paint(FindEdit);
     EB.paint(ReplaceEdit);
     EB.paint(GotoEdit);
     y := top + 200;
-    K.CreateButton(btnFindNext, left, y, btnWidth, btnHeight, K.btnColor, "next"); INC(y, btnHeight + 10);
+    K.CreateButton(btnFindNext, left, y, btnWidth, btnHeight, K.colors.button, "next"); INC(y, btnHeight + 10);
-    K.CreateButton(btnReplace, left, y, btnWidth, btnHeight, K.btnColor, "replace"); INC(y, btnHeight + 10);
+    K.CreateButton(btnReplace, left, y, btnWidth, btnHeight, K.colors.button, "replace"); INC(y, btnHeight + 10);
-    K.CreateButton(btnReplaceAll, left, y, btnWidth + 5*fontWidth - 2, btnHeight, K.btnColor, "replace all");
+    K.CreateButton(btnReplaceAll, left, y, btnWidth + 5*fontWidth - 2, btnHeight, K.colors.button, "replace all");
-    K.CreateButton(btnGoto, left, top + 380, btnWidth, btnHeight, K.btnColor, "go");
+    K.CreateButton(btnGoto, left, top + 380, btnWidth, btnHeight, K.colors.button, "go");
 END SearchPanel;
 PROCEDURE draw_window;
 VAR
     width, height: INTEGER;
 BEGIN
     K.BeginDraw;
-    K.CreateWindow(30 + K.GetTickCount() MOD 128, 30 + K.GetTickCount() MOD 128, winWidth, winHeight, K.winColor, 73H, 0, 0, "");
+    K.CreateWindow(30 + K.GetTickCount() MOD 128, 30 + K.GetTickCount() MOD 128, winWidth, winHeight, K.colors.work, 73H, 0, 0, "");
     IF (text # NIL) & ~K.RolledUp() THEN
     	IF confirm THEN
     		resetTimer
     	END;
         confirm := FALSE;
         K.ClientSize(width, height);
-        K.DrawRect(0, 0, width, TOP - 1, K.winColor);
+        K.DrawRect(0, 0, width, TOP - 1, K.colors.work);
-        K.DrawRect(0, 0, LEFT, height, K.winColor);
+        K.DrawRect(0, 0, LEFT, height, K.colors.work);
-        K.DrawRect(width - RIGHT_PADDING, 0, RIGHT_PADDING, height, K.winColor);
+        K.DrawRect(width - RIGHT_PADDING, 0, RIGHT_PADDING, height, K.colors.work);
-        K.DrawRect(LEFT + canvas.width + 1, TOP + canvas.height + 1, scrollWidth - 1, scrollWidth - 1, K.winColor);
+        K.DrawRect(LEFT + canvas.width + 1, TOP + canvas.height + 1, scrollWidth - 1, scrollWidth - 1, K.colors.work);
         Menu.DrawMain(mainMenu);
     confirm := TRUE;
     left := (canvas.width - width) DIV 2 + LEFT;
     top := (canvas.height - height) DIV 2 + TOP;
     right := left + width - 1;
     bottom := top + height - 1;
-    K.DrawRect(left, top, width, height, K.winColor);
+    K.DrawRect(left, top, width, height, K.colors.work);
-    Rect(left, top, right, bottom, K.borderColor);
+    Rect(left, top, right, bottom, K.colors.line);
-    K.DrawText866(left + (width - 10*fontWidth) DIV 2, top + 10, K.textColor, "save file?");
+    K.DrawText866(left + (width - 10*fontWidth) DIV 2, top + 10, K.colors.work_text, "save file?");
-    K.CreateButton(btnYes, left + 10, top + 35, btnWidth, btnHeight, K.btnColor, "yes");
+    K.CreateButton(btnYes, left + 10, top + 35, btnWidth, btnHeight, K.colors.button, "yes");
-    K.CreateButton(btnNo, left + 20 + btnWidth, top + 35, btnWidth, btnHeight, K.btnColor, "no");
+    K.CreateButton(btnNo, left + 20 + btnWidth, top + 35, btnWidth, btnHeight, K.colors.button, "no");
 END Confirm;
     resetTimer;
     draw_window
 END SwitchTab;
-PROCEDURE open;
+PROCEDURE open (_fileName: RW.tFileName): BOOLEAN;
 VAR
-    fileName: RW.tFileName;
+	fileName: RW.tFileName;
+    nov: T.tText;
-    nov: T.tText;
+    err, n: INTEGER;
+    res: BOOLEAN;
-    err, n: INTEGER;
+BEGIN
+	res := TRUE;
+    IF textsCount < maxTexts THEN
-BEGIN
+    	fileName := _fileName;
-    IF textsCount < maxTexts THEN
+    	IF fileName = "" THEN
+        	OD._type := OpenDlg.topen;
-        OD._type := OpenDlg.topen;
+        	OpenFile(fileName, EditFilter)
-        OpenFile(fileName, EditFilter);
+        END;
         IF fileName # "" THEN
             n := getFileNum(fileName);
             IF n = -1 THEN
                 nov := T.open(fileName, err);
+                IF nov = NIL THEN
+                    error("error opening file");
-                IF nov = NIL THEN
+                    SwitchTab(curText);
-                    error("error opening file")
+                    res := FALSE
                 ELSE
                 	T.SetPos(nov, 0, 0);
                     insert(textsCount, nov);
             ELSE
                 SwitchTab(n)
             END
         END
     ELSE
-        error("too many files")
+        error("too many files");
+        res := FALSE
     END
+    RETURN res
 END open;
+PROCEDURE OpenDial;
+VAR
+	res: BOOLEAN;
+BEGIN
+	res := open("")
+END OpenDial;
 PROCEDURE createSearchForm;
 BEGIN
 	EB.create(LEFT_PADDING, TOP + 20, EditBox_Width, EDITBOX_MAXCHARS, FindEdit);
 	    |menuSelectAll: T.key(text, ORD("A"), FALSE, TRUE)
 	    |menuNew:
 	        NewFile
 	    |menuOpen:
-	        open
+	        OpenDial
 	    |menuSave:
 	        save(text);
 	        repaint
 	    |menuSaveAs:
                              key := -2
                         |21: T.redo(text);
                              key := -1
                         |22: key := ORD("U")
                         |24: key := -1;
-                             open
+                             OpenDial
                         |30: key := ORD("A")
                         |31: key := -1;
                              save(text)
                         |32: key := ORD("D")
                         |38: key := ORD("L")
         Close
     |btnNew:
         NewFile;
         repaint
     |btnOpen:
-        open
+        OpenDial
     |btnSave:
         save(text);
         repaint
     |btnSearch:
         ShowSearchPanel(FALSE);
-        K.SetEventsMask({0, 1, 2, 5, 6, 31})
+		K.SetEventsMask({0, 1, 2, 5, 6, 31})
-    ELSE
+	ELSE
-    	SetCaption(text.fileName);
+		SetCaption(text.fileName);
-        K.SetEventsMask({0, 30, 31})
+		K.SetEventsMask({0, 30, 31})
-    END;
+	END;
-    draw_window
+	draw_window;
+	IF SkinHeight # K.SkinHeight() THEN
+		SkinHeight := K.SkinHeight();
+		Redraw(resized, width, height, cliWidth, cliHeight)
+	END
 END Redraw;
 END ScrollChange;
-PROCEDURE main;
-VAR
+PROCEDURE main;
-    err: INTEGER;
+VAR
     fileName, filePath: RW.tFileName;
     width, height, cliWidth, cliHeight: INTEGER;
     resized: BOOLEAN;
-    firstClickX, firstClickY, time, blink: INTEGER;
+    firstClickX, firstClickY, time, blink, i: INTEGER;
 BEGIN
 	header := "";
     K.GetSystemColors;
     switch := FALSE;
     closing := FALSE;
     textsCount := 0;
     curText := 0;
     mainTID := K.ThreadID();
     K.SetIPC(IPC);
-    U.ptr2str(K.GetName(), AppPath);
+    Args.GetArg(0, AppPath);
     Ini.load(AppPath);
     leftButton := FALSE;
     resized := FALSE;
     winWidth := MAX(winWidth, minWinWidth);
     winHeight := MAX(winHeight, minWinHeight);
     cliWidth := winWidth;
     cliHeight := winHeight;
     LEFT := LEFT_PADDING;
+    SkinHeight := K.SkinHeight();
-    canvas := G.CreateCanvas(winWidth - (LEFT + RIGHT + 11 + RIGHT_PADDING), winHeight - (TOP + BOTTOM + 5) - K.SkinHeight());
+    canvas := G.CreateCanvas(winWidth - (LEFT + RIGHT + 11 + RIGHT_PADDING), winHeight - (TOP + BOTTOM + 5) - SkinHeight);
     tabs := Tabs.create();
     Tabs.setArea(tabs, LEFT, TOP - Tabs.tabHeight, canvas.width, Tabs.tabHeight);
     font1 := G.CreateFont(1, "", {});
     font2 := G.CreateFont(2, "", {});
     font := font1;
     G.SetFont(canvas, font);
     T.init(resetTimer);
     T.setCanvas(canvas);
-    U.ptr2str(K.GetCommandLine(), fileName);
     context := CreateContextMenu();
     menuFile := CreateMenuFile();
     subCurLine := CreateMenuCurLine();
     Toolbar.delimiter(toolbar);
     Toolbar.add(toolbar, btnBuild,  54, "");
     Toolbar.add(toolbar, btnRun,    53, "");
+    Ini.getSettings(buildScript, runScript, debugScript);
-    Ini.getSettings(buildScript, runScript, debugScript);
+    filePath := "/sys";
-    IF fileName = "" THEN
+    IF Args.argc = 1 THEN
         text := T.New();
+        insert(0, text);
-        filePath := "/sys"
+        T.SetPos(text, 0, 0)
-    ELSE
-        text := T.open(fileName, err);
+    END;
-        IF text = NIL THEN
+	FOR i := 1 TO Args.argc - 1 DO
-            error("error opening file");
+		Args.GetArg(i, fileName);
-            K.Exit
-        ELSE
+		IF open(fileName) THEN
-            U.getPath(fileName, filePath)
+			U.getPath(fileName, filePath)
-        END
+		END
-    END;
+	END;
+	IF textsCount = 0 THEN
+		K.Exit
-    OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
+	END;
+	SwitchTab(textsCount - 1);
     insert(0, text);
     Scroll.init(ScrollChange);
     Scroll.create(FALSE, canvas.width + 1, scrollWidth, scrollWidth, scrollWidth*3 DIV 2, hScroll);
     Scroll.create(TRUE, scrollWidth, canvas.height + 2, scrollWidth, scrollWidth*3 DIV 2, vScroll);
-    T.resize(canvas.width, canvas.height);
-    T.SetPos(text, 0, 0);
+    T.resize(canvas.width, canvas.height);
     confirm := FALSE;
     notFound := FALSE;
     menuFindClicked := FALSE;
     menuActive := FALSE;
     new_searchText := "";
     searchText := "";
     cs := FALSE;
     whole := FALSE;
     replaced := 0;
+	OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
     K.SetEventsMask({0, 1, 2, 5, 6, 31});
     Menu.init(resetTimer);
     draw_window;
     blink := Ini.blink;
 	IF blink <= 0 THEN

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9599 → 9628