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

     CB := Clipboard, Languages,
     ChangeLog, Scroll, CheckBox,
     RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar;
 CONST
-    HEADER = "CEdit (09-feb-2022)";
+    HEADER = "CEdit (25-feb-2022)";
     ShellFilter = "";
     toolbar: Toolbar.tToolbar;
     CursorTime, CurrentTime: INTEGER;
+    timerEnabled: BOOLEAN;
-    timerEnabled: BOOLEAN;
+    IPC: ARRAY 64 OF INTEGER; mainTID: INTEGER;
     DEC(top, Tabs.tabHeight);
     right := left + EditBox_Width + SEARCH_PADDING*2;
     bottom := top + 395 + btnHeight + SEARCH_PADDING;
     Rect(left, top, right, bottom, K.colors.line);
-    K.CreateButton(btnCloseSearch, right - 20, top, 20, 20, 0EF999FH, "");
+    K.CreateButton(btnCloseSearch, right - 20, top, 20, 20, Tabs.btnCloseColor, "");
     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);
     Menu.AddMenuItem(menu, menuCopy,      "copy         ctrl-C");
     Menu.AddMenuItem(menu, menuPaste,     "paste        ctrl-V");
     Menu.AddMenuItem(menu, menuDelete,    "delete");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuSelectAll, "select all   ctrl-A");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateContextMenu;
     Menu.AddMenuItem(menu, menuFolder,  "folder");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuClose,   "close       ctrl-W");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuExit,    "exit");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuFile;
     Menu.child(menu, subCurLine);
     Menu.AddMenuItem(menu, menuIndent,    "indent");
     Menu.child(menu, subIndent);
     Menu.AddMenuItem(menu, menuCase,      "case");
     Menu.child(menu, subCase);
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuEdit;
     Menu.AddMenuItem(menu, menuFindPrev, "find previous    shift-F3");
     Menu.AddMenuItem(menu, menuGoto,     "go to line       ctrl-G");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuBookmark, "bookmark");
     Menu.child(menu, subBookmark);
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuSearch;
     Menu.AddMenuItem(menu, menuUTF8BOM, E.names[E.UTF8BOM]);
     Menu.AddMenuItem(menu, menuUTF8,    E.names[E.UTF8]);
     Menu.AddMenuItem(menu, menuCP866,   E.names[E.CP866]);
     Menu.AddMenuItem(menu, menuCP1251,  E.names[E.CP1251]);
     Menu.delimiter(menu);
-    Menu.AddMenuItem(menu, menuEOL,     "EOL");
-    Menu.child(menu, subEOL);
-    Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuConv1251_866, "convert 1251 >> 866");
     Menu.AddMenuItem(menu, menuConv866_1251, "convert 866 >> 1251");
+    Menu.delimiter(menu);
+    Menu.AddMenuItem(menu, menuEOL,     "EOL");
+    Menu.child(menu, subEOL);
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuEncoding;
 BEGIN
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuCRLF, E.eolNames[E.EOL_CRLF]);
     Menu.AddMenuItem(menu, menuLF,   E.eolNames[E.EOL_LF]);
     Menu.AddMenuItem(menu, menuCR,   E.eolNames[E.EOL_CR]);
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuEOL;
         Menu.AddMenuItem(menu, idx, colors.name);
         INC(idx);
         colors := colors.next(Ini.tSection)
     END;
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuView;
     Menu.AddMenuItem(menu, menuLua,    "Lua");
     Menu.AddMenuItem(menu, menuOberon, "Oberon");
     Menu.AddMenuItem(menu, menuPascal, "Pascal");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuText,   "Text");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuLanguage;
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuDebug,       "debug    ctrl-F8");
     Menu.AddMenuItem(menu, menuDebugScript, "script");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuFASM, "Fasm");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuProgram;
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuPipet,   "pipet");
     Menu.AddMenuItem(menu, menuMagnify, "magnify");
     Menu.AddMenuItem(menu, menuBoard,   "board");
     Menu.AddMenuItem(menu, menuSysFunc, "system functions");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuTools;
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuLineNumbers,  "line numbers");
     Menu.AddMenuItem(menu, menuAutoIndents,  "automatic indents");
     Menu.AddMenuItem(menu, menuAutoBrackets, "automatic brackets");
     Menu.AddMenuItem(menu, menuTrimSpace,    "trim trailing space");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuOptions;
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuMoveUp,    "move up     ctrl-Up");
     Menu.AddMenuItem(menu, menuMoveDown,  "move down   ctrl-Down");
     Menu.AddMenuItem(menu, menuDuplicate, "duplicate   ctrl-D");
     Menu.AddMenuItem(menu, menuRemove,    "remove      ctrl-Del");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuCurLine;
 PROCEDURE CreateMenuIndent(): Menu.tMenu;
 VAR
     menu: List.tList;
 BEGIN
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuIncInd, "increase    Tab");
     Menu.AddMenuItem(menu, menuDecInd, "decrease    shift-Bksp");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuIndent;
 PROCEDURE CreateMenuCase(): Menu.tMenu;
 VAR
     menu: List.tList;
 BEGIN
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuUpper, "UPPER    ctrl-U");
     Menu.AddMenuItem(menu, menuLower, "lower    ctrl-L");
 BEGIN
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuToggleBookmark, "toggle      ctrl-F2");
     Menu.AddMenuItem(menu, menuNextBookmark,   "next        F2");
     Menu.AddMenuItem(menu, menuPrevBookmark,   "previous    shift-F2");
-    RETURN Menu.create(menu)
+    RETURN Menu.create(menu, mainTID)
 END CreateMenuBookmark;
             closeFile(TRUE, btn)
         ELSE
             SwitchTab(btn)
         END;
         btn := 0
+    ELSIF U.between(Tabs.btnClose, btn, Tabs.btnClose + maxTexts - 1) THEN
+        DEC(btn, Tabs.btnClose);
+        IF ~middle THEN
+            IF texts[btn].modified THEN
+                SwitchTab(btn)
+            END;
+            closeFile(TRUE, btn);
+            middle := TRUE
+        END;
+        btn := 0
     ELSE
         IF middle THEN
             btn := 0
         END
     END;
             ELSE
                 firstClickX := x;
                 firstClickY := y;
                 time := click(firstClickX, firstClickY)
             END
+        END;
+        IF msState = {} THEN
+        	mouse(x, y);
+        	Menu.MouseMove(mainMenu, x + LEFT, y + TOP)
         END
     END;
     IF search & searchOpened THEN
 	    CheckBox.mouse(BKW);
     	CheckBox.mouse(CS);
 		repaint
 	END
 END ScrollChange;
+PROCEDURE receiveIPC;
+VAR
+	x, y, cliX, cliY, winX, winY: INTEGER;
+BEGIN
+	K.ClientPos(cliX, cliY);
+	K.WinPos(winX, winY);
+	x := IPC[2] DIV 65536 - cliX - winX;
+	y := IPC[2] MOD 65536 - cliY - winY;
+	Menu.MouseMove(mainMenu, x, y);
+	IPC[1] := 0;
+	IPC[0] := 0
+END receiveIPC;
 PROCEDURE main;
 VAR
     fileName, filePath: RW.tFileName;
     width, height, cliWidth, cliHeight: INTEGER;
     resized: BOOLEAN;
     firstClickX, firstClickY, time, blink, i: INTEGER;
     key, scr: INTEGER;
+    text_ptr, text_size, errno: INTEGER;
-    text_ptr, text_size, errno: INTEGER;
+BEGIN
-BEGIN
+	mainTID := K.ThreadID();
 	header := "";
     K.GetSystemColors;
     switch := FALSE;
     G.SetFont(canvas, font);
     T.init(resetTimer, Ini.lineNumbers, Ini.autoIndents, Ini.autoBrackets, Ini.trimSpace);
     Ini.selectSection(Ini.theme);
     T.setCanvas(canvas);
+    mainMenu := Menu.CreateMain(mainMenuBtn);
     Menu.init(resetTimer);
     context := CreateContextMenu();
     menuFile := CreateMenuFile();
     subCurLine := CreateMenuCurLine();
     menuLanguage := CreateMenuLanguage();
     menuProgram := CreateMenuProgram();
     menuTools := CreateMenuTools();
     menuOptions := CreateMenuOptions();
     mainMenu := Menu.CreateMain(mainMenuBtn);
     Menu.AddMainItem(mainMenu, "file", menuFile);
     Menu.AddMainItem(mainMenu, "edit", menuEdit);
     Menu.AddMainItem(mainMenu, "search", menuSearch);
     Menu.AddMainItem(mainMenu, "encoding", menuEncoding);
     whole := FALSE;
     replaced := 0;
+	OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
+	IPC[1] := 0;
-	OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
+	IPC[0] := 0;
 	K.SetIPC(IPC);
-    K.SetEventsMask({0, 1, 2, 5, 31});
+    K.SetEventsMask({0, 1, 2, 5, 6, 31});
     draw_window;
     blink := Ini.blink;
 	IF blink <= 0 THEN
         	IF ~K.RolledUp() THEN
         		MouseEvent(resized, firstClickX, firstClickY, time)
         	ELSE
         		scr := K.Scroll()
         	END
+        |7: receiveIPC
         END
     END
 END main;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9708 → 9730