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 (16-jan-2022)";
+    HEADER = "CEdit (18-jan-2022)";
     ShellFilter = "";
     menuCRLF = 142;
     menuCR = 143;
+    maxTexts = 32;
+	SHIFT = Menu.SHIFT;
-    maxTexts = 32;
+	CTRL  = Menu.CTRL;
 VAR
     new_searchText, searchText, replaceText, gotoText: T.tString;
     cs, whole: BOOLEAN;
-    replaced: INTEGER;
-    mainTID: INTEGER;
+    replaced: INTEGER;
     context, menuFile, menuEdit, menuSearch, menuEncoding,
     menuView, menuLanguage, menuProgram, menuTools,
     subCurLine, subIndent, subCase, subBookmark, subEOL: Menu.tMenu;
-    mainMenu: Menu.tMain;
-    menuActive: BOOLEAN;
+    mainMenu: Menu.tMain;
-    toolbar: Toolbar.tToolbar;
+    menuActive: BOOLEAN;
     Menu.close(menuTools);
     Menu.close(context)
 END CloseMenu;
-PROCEDURE MenuItemClick (menu: Menu.tMenu; id: INTEGER);
-VAR
-	msg: ARRAY 2 OF INTEGER;
-BEGIN
-	msg[0] := id;
-	msg[1] := 8;
-    K.SendIPC(mainTID, msg)
-END MenuItemClick;
 PROCEDURE goto;
 VAR
     gotoVal: INTEGER;
 		script := temp
 	END
 END setScript;
-PROCEDURE receiveIPC;
-VAR
+PROCEDURE ClickMenu;
-	scrollIPC: BOOLEAN;
+VAR
-	item: List.tItem;
-BEGIN
-	scrollIPC := FALSE;
-    IF IPC[0] = mainTID THEN
-    	IF IPC[2] = Scroll.ScrollIPC THEN
-    		Scroll.receiveIPC(IPC, scrollIPC)
-    	END;
-    	IF ~scrollIPC THEN
-    		IPC[2] := 0
-    	END
+	item: List.tItem;
-    ELSE
-    	IF ~Menu.isSender(IPC[0]) THEN
-   			IPC[2] := 0
-    	ELSE
+BEGIN
-    		IF IPC[2] < 0 THEN
+	IF Menu.MenuItem < 0 THEN
-    			item := List.getItem(mainMenu, (-IPC[2] - mainMenuBtn) MOD mainMenu.count);
+		item := List.getItem(mainMenu, (-Menu.MenuItem - mainMenuBtn) MOD mainMenu.count);
-    			IF item # NIL THEN
+		IF item # NIL THEN
-    				ShowMenu(item(Menu.tMainItem).menu)
+			ShowMenu(item(Menu.tMainItem).menu)
-    			END;
-    			IPC[2] := 0
-    		END
+		END;
-    	END
-    END;
+		Menu.SetItem(0)
-    IF ~scrollIPC THEN
+	END;
-	    CASE IPC[2] OF
+    CASE Menu.MenuItem OF
-	    |0:
+    |0:
-	    |menuCut:       T.key(text, ORD("X"), FALSE, TRUE)
+    |menuCut:       T.key(text, ORD("X"), FALSE, TRUE)
-	    |menuCopy:      T.key(text, ORD("C"), FALSE, TRUE)
+    |menuCopy:      T.key(text, ORD("C"), FALSE, TRUE)
-	    |menuBoard:
+    |menuBoard:
-	        K.Run("/sys/develop/board", "")
+        K.Run("/sys/develop/board", "")
-	    |menuSysFunc:
+    |menuSysFunc:
-	        K.Run("/sys/docpack", "f")
+        K.Run("/sys/docpack", "f")
-	    |menuColors..menuMaxColors:
+    |menuColors..menuMaxColors:
-	        Ini.selectSection(IPC[2] - menuColors)
+        Ini.selectSection(Menu.MenuItem - menuColors)
-	    |menuMoveUp:
+    |menuMoveUp:
-	    	T.MoveLines(text, FALSE)
+    	T.MoveLines(text, FALSE)
-	    |menuMoveDown:
+    |menuMoveDown:
-			T.MoveLines(text, TRUE)
+		T.MoveLines(text, TRUE)
-	    |menuDuplicate:
+    |menuDuplicate:
-		|menuUpper:
+	|menuUpper:
-			T.chCase(text, TRUE)
+		T.chCase(text, TRUE)
-		|menuLower:
+	|menuLower:
-			T.chCase(text, FALSE)
+		T.chCase(text, FALSE)
-	    END;
+    END;
-    	IPC[0] := 0;
-    	IPC[1] := 0
-    END
-END receiveIPC;
-PROCEDURE MenuKeyDown (menu: Menu.tMenu; key: INTEGER): BOOLEAN;
-VAR
-    menuItem: INTEGER;
-    shift, ctrl: BOOLEAN;
-BEGIN
-    menuItem := -1;
+    Menu.SetItem(0)
-    K.getKBState(shift, ctrl);
-    IF ctrl THEN
-        CASE key DIV 65536 OF
-        |17: menuItem := menuClose
-        |21: menuItem := menuRedo
-        |30: menuItem := menuSelectAll
-        |32: menuItem := menuDuplicate
-        |33,
-: menuItem := menuFind
-        |34: menuItem := menuGoto
-        |44: menuItem := menuUndo
-        |45: menuItem := menuCut
-        |46: menuItem := menuCopy
-        |47: menuItem := menuPaste
-        |24: menuItem := menuOpen
-        |31: menuItem := menuSave
-        |49: menuItem := menuNew
-        |67: menuItem := menuBuild
-        |83: menuItem := menuRemove
-        |22: menuItem := menuUpper
-        |38: menuItem := menuLower
-        |60: menuItem := menuToggleBookmark
-        |72: menuItem := menuMoveUp
-        |80: menuItem := menuMoveDown
-        ELSE
-        END
-    ELSE
-        IF key DIV 65536 = 83 THEN
-            menuItem := menuDelete
-        ELSIF key DIV 65536 = 67 THEN
-            menuItem := menuRun
-        ELSIF key DIV 65536 = 15 THEN
-            menuItem := menuIncInd
-        ELSIF (key DIV 65536 = 14) & shift THEN
-            menuItem := menuDecInd
-        ELSIF key DIV 65536 = 60 THEN
-        	IF shift THEN
-        		menuItem := menuPrevBookmark
-        	ELSE
-        		menuItem := menuNextBookmark
-        	END
-        END
-    END;
-    IF menuItem # -1 THEN
-        IF Menu.isEnabled(menu, menuItem) THEN
-            MenuItemClick(menu, menuItem)
-        ELSE
-            menuItem := -1
-        END
-    END
-    RETURN menuItem # -1
-END MenuKeyDown;
+END ClickMenu;
 PROCEDURE CreateContextMenu (): Menu.tMenu;
     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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 END CreateMenuSearch;
     Menu.AddMenuItem(menu, menuCP866,   E.names[E.CP866]);
     Menu.AddMenuItem(menu, menuWin1251, E.names[E.W1251]);
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuEOL,     "EOL");
     Menu.child(menu, subEOL);
-    RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 END CreateMenuEncoding;
 BEGIN
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuCRLF, RW.eolNames[RW.EOL_CRLF]);
     Menu.AddMenuItem(menu, menuLF,   RW.eolNames[RW.EOL_LF]);
     Menu.AddMenuItem(menu, menuCR,   RW.eolNames[RW.EOL_CR]);
-    RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 END CreateMenuEOL;
         Menu.AddMenuItem(menu, idx, colors.name);
         INC(idx);
         colors := colors.next(Ini.tSection)
     END;
-    RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 END CreateMenuLanguage;
     Menu.AddMenuItem(menu, menuRun,         "run           F9");
     Menu.AddMenuItem(menu, menuRunScript,   "script");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuDebug,       "debug");
     Menu.AddMenuItem(menu, menuDebugScript, "script");
-    RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 END CreateMenuTools;
     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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 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, MenuItemClick, MenuKeyDown)
+    RETURN Menu.create(menu)
 END CreateMenuBookmark;
+PROCEDURE Shortcuts;
+BEGIN
+    Menu.AddShortcut(17 + CTRL,  menuClose);
+    Menu.AddShortcut(21 + CTRL,  menuRedo);
+    Menu.AddShortcut(30 + CTRL,  menuSelectAll);
+    Menu.AddShortcut(32 + CTRL,  menuDuplicate);
+    Menu.AddShortcut(33 + CTRL,  menuFind);
+    Menu.AddShortcut(35 + CTRL,  menuFind);
+    Menu.AddShortcut(34 + CTRL,  menuGoto);
+    Menu.AddShortcut(44 + CTRL,  menuUndo);
+    Menu.AddShortcut(45 + CTRL,  menuCut);
+    Menu.AddShortcut(46 + CTRL,  menuCopy);
+    Menu.AddShortcut(47 + CTRL,  menuPaste);
+    Menu.AddShortcut(24 + CTRL,  menuOpen);
+    Menu.AddShortcut(31 + CTRL,  menuSave);
+    Menu.AddShortcut(49 + CTRL,  menuNew);
+    Menu.AddShortcut(67 + CTRL,  menuBuild);
+    Menu.AddShortcut(83 + CTRL,  menuRemove);
+    Menu.AddShortcut(22 + CTRL,  menuUpper);
+    Menu.AddShortcut(38 + CTRL,  menuLower);
+    Menu.AddShortcut(60 + CTRL,  menuToggleBookmark);
+    Menu.AddShortcut(72 + CTRL,  menuMoveUp);
+    Menu.AddShortcut(80 + CTRL,  menuMoveDown);
+    Menu.AddShortcut(83,         menuDelete);
+    Menu.AddShortcut(67,         menuRun);
+    Menu.AddShortcut(15,         menuIncInd);
+    Menu.AddShortcut(14 + SHIFT, menuDecInd);
+    Menu.AddShortcut(60 + SHIFT, menuPrevBookmark);
+    Menu.AddShortcut(60,         menuNextBookmark);
+    Menu.AddShortcut(61 + SHIFT, menuFindPrev);
+    Menu.AddShortcut(61,         menuFindNext);
+END Shortcuts;
 PROCEDURE HideSearch;
 BEGIN
     SetFocus(FindEdit, FALSE);
 VAR
     btn: INTEGER;
     middle, exit: BOOLEAN;
     menu: Menu.tMenu;
 BEGIN
+	exit := FALSE;
     btn := K.ButtonCode(middle);
     IF U.between(Tabs.btnID, btn, Tabs.btnID + maxTexts - 1) THEN
         DEC(btn, Tabs.btnID);
         IF middle THEN
             IF texts[btn].modified THEN
     	IF menu # NIL THEN
     		ShowMenu(menu);
     		btn := 0
     	END
     END;
-    CASE btn OF
-    |Tabs.btnLeft:  Tabs.scroll(tabs, -1); switch := TRUE; repaint
-    |Tabs.btnRight: Tabs.scroll(tabs, +1); switch := TRUE; repaint
     CASE btn OF
-    |0:
+    |0:
+    |Tabs.btnLeft, Tabs.btnRight:
+    	Tabs.scroll(tabs, btn);
     	switch := TRUE
     |btnNo:
         exit := closing;
         closeFile(FALSE, curText);
-        repaint;
-        IF exit THEN
-            Close
-        END
+        repaint
     |btnYes:
         exit := closing;
         save(text);
         IF ~text.modified THEN
             closeFile(FALSE, curText)
         END;
-        repaint;
-        IF exit THEN
-            Close
-        END
+        repaint
     |btnClose:
-        Close
+    	exit := TRUE
     |btnNew:
-        NewFile;
-        repaint
+        NewFile
     |btnOpen:
         OpenDial
     |btnSave:
-        save(text);
-        repaint
+        save(text)
     |btnSearch:
-        ShowSearchPanel(FALSE);
-        repaint
+        ShowSearchPanel(FALSE)
     |btnCloseSearch:
         Search
     |btnHideSearch:
         HideSearch
     |btnUndo:
-        T.undo(text);
-        repaint
+        T.undo(text)
     |btnRedo:
-        T.redo(text);
-        repaint
+        T.redo(text)
     |btnUpper:
-        T.chCase(text, TRUE);
-        repaint
+        T.chCase(text, TRUE)
     |btnLower:
-        T.chCase(text, FALSE);
-        repaint
+        T.chCase(text, FALSE)
     |btnBuild:
         Script(buildScript)
     |btnRun:
         Script(runScript)
     |btnFindNext:
         IF searchText # "" THEN
             notFound := ~T.findNext(text, BKW.value);
-            SetFocus(FindEdit, FALSE);
-            repaint
+            SetFocus(FindEdit, FALSE)
         END
     |btnReplace:
         T.replace(text, replaceText, LENGTH(searchText));
-        SetFocus(FindEdit, FALSE);
-        repaint
+        SetFocus(FindEdit, FALSE)
     |btnReplaceAll:
         notFound := ~T.search(text, searchText, cs, whole);
         IF ~notFound THEN
             replaced := T.replaceAll(text, replaceText, LENGTH(searchText));
         END;
-        SetFocus(FindEdit, FALSE);
-        repaint
+        SetFocus(FindEdit, FALSE)
     |btnGoto:
+        goto
+    END;
+	IF exit THEN
+		Close
-        goto;
+	ELSE
-        repaint
+		repaint
-    END
+	END
             END
         END;
 		Scroll.mouse(hScroll);
+		Scroll.mouse(vScroll);
-		Scroll.mouse(vScroll);
+		msState := K.MouseState();
         T.getScroll(text, scrollX, scrollY);
         IF (hScroll.value # scrollX) OR (vScroll.value # scrollY) THEN
 			T.scroll(text, hScroll.value - scrollX, vScroll.value - scrollY);
         	repaint
     resized := FALSE
 END MouseEvent;
+PROCEDURE Redraw (VAR resized: BOOLEAN; VAR width, height, cliWidth, cliHeight: INTEGER);
 VAR
+	onClose: BOOLEAN;
+BEGIN
+	onClose := (Menu.MenuItem = menuClose) OR (Menu.MenuItem = menuExit);
+	IF ~onClose THEN
-PROCEDURE Redraw (VAR resized: BOOLEAN; VAR width, height, cliWidth, cliHeight: INTEGER);
+		ClickMenu
-BEGIN
+	END;
 	K.GetSystemColors;
 	IF ~K.RolledUp() THEN
 		K.ClientSize(width, height);
 		IF (width # cliWidth) OR (height # cliHeight) THEN
 			cliWidth := width;
 			cliHeight := height;
 			resize;
 			resized := TRUE
 		END;
-		K.SetEventsMask({0, 1, 2, 5, 6, 31})
+		K.SetEventsMask({0, 1, 2, 5, 31})
 	ELSE
 		SetCaption(text.fileName);
 		K.SetEventsMask({0, 30, 31})
 	END;
 	draw_window;
 	IF SkinHeight # K.SkinHeight() THEN
+		SkinHeight := K.SkinHeight();
+		Redraw(resized, width, height, cliWidth, cliHeight)
+	END;
-		SkinHeight := K.SkinHeight();
+	IF onClose THEN
-		Redraw(resized, width, height, cliWidth, cliHeight)
+		ClickMenu
 	END
 END Redraw;
-PROCEDURE ScrollChange;
 BEGIN
-	Scroll.change(hScroll);
+PROCEDURE ScrollChange;
-	Scroll.change(vScroll);
+BEGIN
-	T.scroll(text, ORD(hScroll.Inc) - ORD(hScroll.Dec), ORD(vScroll.Inc) - ORD(vScroll.Dec));
+	T.scroll(text, hScroll.btn, vScroll.btn);
 	IF menuActive THEN
     K.GetSystemColors;
     switch := FALSE;
     closing := FALSE;
     textsCount := 0;
     curText := 0;
-    mainTID := K.ThreadID();
-    K.SetIPC(IPC);
     Args.GetArg(0, AppPath);
     Ini.load(AppPath);
     leftButton := FALSE;
     resized := FALSE;
     K.ScreenSize(winWidth, winHeight);
     font := font1;
     G.SetFont(canvas, font);
     T.init(resetTimer);
     T.setCanvas(canvas);
     Menu.init(resetTimer);
     context := CreateContextMenu();
     menuFile := CreateMenuFile();
     subCurLine := CreateMenuCurLine();
     subIndent := CreateMenuIndent();
     Menu.AddMainItem(mainMenu, "encoding", menuEncoding);
     Menu.AddMainItem(mainMenu, "view", menuView);
     Menu.AddMainItem(mainMenu, "language", menuLanguage);
     Menu.AddMainItem(mainMenu, "program", menuProgram);
     Menu.AddMainItem(mainMenu, "tools", menuTools);
+    Shortcuts;
     Toolbar.create(toolbar, LEFT_PADDING + 5, toolbarTop);
     Toolbar.add(toolbar, btnNew,     2, "");
     Toolbar.add(toolbar, btnOpen,    0, "");
 	IF textsCount = 0 THEN
 		K.Exit
 	END;
 	SwitchTab(textsCount - 1);
-    Scroll.init(ScrollChange);
-    Scroll.create(FALSE, canvas.width + 1, scrollWidth, scrollWidth, scrollWidth*3 DIV 2, hScroll);
+    Scroll.create(FALSE, canvas.width + 1, scrollWidth, scrollWidth, scrollWidth*3 DIV 2, ScrollChange, hScroll);
-    Scroll.create(TRUE, scrollWidth, canvas.height + 2, scrollWidth, scrollWidth*3 DIV 2, vScroll);
+    Scroll.create(TRUE, scrollWidth, canvas.height + 2, scrollWidth, scrollWidth*3 DIV 2, ScrollChange, vScroll);
     T.resize(canvas.width, canvas.height);
     confirm := FALSE;
     notFound := FALSE;
     menuFindClicked := FALSE;
     whole := FALSE;
     replaced := 0;
 	OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
     K.SetEventsMask({0, 1, 2, 5, 6, 31});
-    Menu.init(resetTimer);
+    K.SetEventsMask({0, 1, 2, 5, 31});
     draw_window;
     blink := Ini.blink;
 	IF blink <= 0 THEN
     	IF (CurrentTime - CursorTime > blink) & (blink > 0) & timerEnabled THEN
     		CursorTime := CurrentTime;
     		T.toggleCursor;
     		repaint
     	END;
         CASE K.EventTimeout(10) OF
         |0:
         |1:	Redraw(resized, width, height, cliWidth, cliHeight)
         |2: KeyDown(K.GetKey())
         |3: BtnClick
         |6: MouseEvent(resized, firstClickX, firstClickY, time)
-        |7: receiveIPC
         END
     END
 END main;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9645 → 9648