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 (24-sep-2021)";
+    header = "CEdit (28-sep-2021)";
     ShellFilter = "";
     new_searchText, searchText, replaceText, gotoText: T.tString;
     cs, whole: BOOLEAN;
     replaced: INTEGER;
-    mainTID, delay: INTEGER;
+    mainTID: INTEGER;
 VAR
 	res: BOOLEAN;
 BEGIN
 	res := FALSE;
 	IF edit # NIL THEN
-	    res := 1 IN BITS(edit.flags)
+	    res := 1 IN edit.flags
 	END
 	RETURN res
 END EditBox_Focus;
 PROCEDURE EditBox_SetFocus (edit: EB.tEditBox; value: BOOLEAN);
 BEGIN
     IF value THEN
-        edit.flags := ORD(BITS(edit.flags) + {1})
+    	INCL(edit.flags, 1)
     ELSE
-        edit.flags := ORD(BITS(edit.flags) - {1})
+    	EXCL(edit.flags, 1)
     END;
     IF search & searchOpened THEN
         EB.paint(edit)
 END WriteModified;
 PROCEDURE DrawState (text: T.tText; width, height: INTEGER);
+VAR
-VAR
+    y: INTEGER;
-    y, w, x: INTEGER;
+    s: ARRAY 24 OF WCHAR;
 BEGIN
     y := (btnHeight - fontHeight) DIV 2 + btnTop;
-    K.DrawRect(width - 32*fontWidth, y, 32*fontWidth, fontHeight, K.winColor);
+    s := "";
-    w := LENGTH(E.names[text.enc])*fontWidth;
+    U.append(s, RW.eolNames[text.eol]);
-    x := width - w;
+    U.append(s, 20X);
-    K.DrawText(x, y, K.textColor, E.names[text.enc]);
-    w := LENGTH(RW.eolNames[text.eol])*fontWidth;
+    U.append(s, E.names[text.enc]);
-    DEC(x, w + 10);
+    K.DrawRect(width - LEN(s)*fontWidth, y, LEN(s)*fontWidth, fontHeight, K.winColor);
-    K.DrawText(x, y, K.textColor, RW.eolNames[text.eol]);
+    K.DrawText(width - LENGTH(s)*fontWidth, y, K.textColor, s);
     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);
     K.DrawText866(LEFT + 16*fontWidth, y, K.textColor, text.fileName);
 END draw_window;
 PROCEDURE mouse (VAR x, y: INTEGER);
-VAR
-    mouseX, mouseY,
-    cliX, cliY,
+VAR
-    winX, winY: INTEGER;
+    msState: SET;
 BEGIN
-    K.MousePos(mouseX, mouseY);
+	K.mouse(msState, x, y);
-    K.WinPos(winX, winY);
-    K.ClientPos(cliX, cliY);
-    x := mouseX - winX - cliX - LEFT;
+	DEC(x, LEFT);
-    y := mouseY - winY - cliY - TOP;
+	DEC(y, TOP)
 END mouse;
 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 := 4002H;
+    edit.flags := {1, 14};
     edit.text_color := 30000000H;
     EditBox_SetFocus(edit, FALSE)
     RETURN edit
 END createEdit;
 PROCEDURE createSearchForm;
 BEGIN
     FindEdit := createEdit(searchLeft, TOP + 20);
     ReplaceEdit := createEdit(searchLeft, TOP + 20 + 55);
     GotoEdit := createEdit(searchLeft, TOP + 20 + 330);
-    GotoEdit.flags := ORD(BITS(GotoEdit.flags) + BITS(8000H));
+    INCL(GotoEdit.flags, 15);
     CheckBox.create("backward", BKW);
     CheckBox.create("match case", CS);
     CheckBox.create("whole word", WH);
 END createSearchForm;
 VAR
     scrollX, scrollY: INTEGER;
     shift, ctrl: BOOLEAN;
 BEGIN
     K.getKBState(shift, ctrl);
-	Scroll.MouseDown(hScroll, x + LEFT, y + TOP);
-	Scroll.MouseDown(vScroll, x + LEFT, y + TOP);
     T.getScroll(text, scrollX, scrollY);
     T.scroll(text, hScroll.value - scrollX, vScroll.value - scrollY);
-    IF search & searchOpened THEN
-	   	CheckBox.MouseDown(BKW, x + LEFT, y + TOP);
-	   	CheckBox.MouseDown(CS,  x + LEFT, y + TOP);
-	   	CheckBox.MouseDown(WH,  x + LEFT, y + TOP);
-   	END;
-    IF (0 <= x) & (x < canvas.width) & (0 <= y) & (y < canvas.height) THEN
+    IF U.between(0, x, canvas.width - 1) & U.between(0, y, canvas.height - 1) THEN
         leftButton := TRUE;
         SetFocus(FindEdit, FALSE);
         IF ~shift THEN
             T.resetSelect(text)
         END;
     repaint
     RETURN K.GetTickCount()
 END click;
-PROCEDURE LeftButtonUp;
-BEGIN
-    leftButton := FALSE;
-    Scroll.MouseUp(hScroll);
-    Scroll.MouseUp(vScroll);
-    CheckBox.MouseUp(BKW);
-    CheckBox.MouseUp(CS);
-    CheckBox.MouseUp(WH);
-END LeftButtonUp;
 PROCEDURE Close;
 VAR
     cont: BOOLEAN;
     winX, winY, cliX, cliY, x, y, i: INTEGER;
     selected, enabled: BOOLEAN;
 BEGIN
     IF menu = context THEN
         mouse(x, y);
-        IF ~((0 <= x) & (x < canvas.width) & (0 <= y) & (y < canvas.height)) THEN
+        IF ~(U.between(0, x, canvas.width - 1) & U.between(0, y, canvas.height - 1)) THEN
             menu := NIL
         END
     ELSE
         K.WinPos(winX, winY);
         K.ClientPos(cliX, cliY);
         menuActive := TRUE
     END
 END ShowMenu;
+PROCEDURE setScript (VAR script: RW.tFileName);
+VAR
+	temp: RW.tFileName;
+BEGIN
+	OpenFile(temp, ShellFilter);
+	IF temp # "" THEN
+		script := temp
+	END
+END setScript;
 PROCEDURE receiveIPC;
 VAR
 	scrollIPC: BOOLEAN;
 			repaint
 		END;
     	IPC[2] := 0
     ELSIF IPC[0] = mainTID THEN
     	IF IPC[2] = Scroll.ScrollIPC THEN
-	    	Scroll.change(hScroll);
-	    	Scroll.change(vScroll);
+    		Scroll.receiveIPC(IPC, scrollIPC)
-	    	T.scroll(text, ORD(hScroll.Inc) - ORD(hScroll.Dec), ORD(vScroll.Inc) - ORD(vScroll.Dec));
-    		IF menuActive THEN
-    			draw_window;
-    			menuActive := FALSE
-    		ELSE
-    			repaint
-    		END;
-    		IF 0 IN K.MouseState() THEN
-    			WHILE (0 IN K.MouseState()) & (delay > 0) DO
-        			K.Pause(1);
-    	    		DEC(delay)
-        		END;
-        		IF delay = 0 THEN
-    				IPC[0] := 0;
-					IPC[1] := 0;
-					scrollIPC := TRUE;
-	        		Scroll.SendIPC;
-    	    		delay := 2
-        		ELSE
-        			delay := Scroll.Delay
-        		END
-        	ELSE
-        		delay := Scroll.Delay
-			END
     	END;
+    	IF ~scrollIPC THEN
-    	IPC[2] := 0
+    		IPC[2] := 0
+    	END
     ELSE
     	IF ~Menu.isSender(IPC[0]) THEN
    			IPC[2] := 0
     	ELSE
     		IF IPC[2] < 0 THEN
     			END;
     			IPC[2] := 0
     		END
     	END
     END;
+    IF ~scrollIPC THEN
-    CASE IPC[2] OF
+	    CASE IPC[2] 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)
-    |menuPaste:     T.key(text, ORD("V"), FALSE, TRUE)
+	    |menuPaste:     T.key(text, ORD("V"), FALSE, TRUE)
-    |menuPascal:
+	    |menuPascal:
-        T.setLang(text, Languages.langPascal)
+	        T.setLang(text, Languages.langPascal)
-    |menuBuild:
+	    |menuBuild:
-        Script(buildScript)
+	        Script(buildScript)
-    |menuBuildScript:
+	    |menuBuildScript:
-        OpenFile(buildScript, ShellFilter)
+	    	setScript(buildScript)
-    |menuRun:
+	    |menuRun:
-        Script(runScript)
+	        Script(runScript)
-    |menuRunScript:
+	    |menuRunScript:
-        OpenFile(runScript, ShellFilter)
+	    	setScript(runScript)
-    |menuDebug:
+	    |menuDebug:
-        Script(debugScript)
+	        Script(debugScript)
-    |menuDebugScript:
+	    |menuDebugScript:
-        OpenFile(debugScript, ShellFilter)
+	    	setScript(debugScript)
-    |menuUTF8BOM:
+	    |menuUTF8BOM:
-        text.enc := E.UTF8BOM
+	        text.enc := E.UTF8BOM
-    |menuUTF8:
+	    |menuUTF8:
-        text.enc := E.UTF8
+	        text.enc := E.UTF8
-    |menuCP866:
+	    |menuCP866:
-	|menuUpper:
+		|menuUpper:
-		T.chCase(text, TRUE)
+			T.chCase(text, TRUE)
-	|menuLower:
+		|menuLower:
-		T.chCase(text, FALSE)
+			T.chCase(text, FALSE)
-    END;
+	    END;
-    IF ~scrollIPC THEN
     	IPC[0] := 0;
     	IPC[1] := 0
     END
 END receiveIPC;
                 |75: key := 37
                 |77: key := 39
                 |82, 91, 219, 92, 220: key := -1 (* insert, windows *)
                 |93: ShowMenu(context); key := -1
                 |83: key := 46
-                |59, 62..66, 68, 87, 88: key := -1 (* F1, F4..F8, F10, F11, F12 *)
+                |59, 62..66, 87, 88: key := -1 (* F1, F4..F8, F11, F12 *)
                 ELSE
                     IF ctrl THEN
                         CASE keyCode OF
                         |17: closeFile(TRUE, curText);
                              key := -2
 BEGIN
 	CloseMenu;
     IF ~resized THEN
         msState := K.MouseState();
         IF ~(0 IN msState) OR (16 IN msState) THEN
-            LeftButtonUp
+        	leftButton := FALSE
         END;
         scroll := K.Scroll();
         IF scroll # 0 THEN
             T.scroll(text, 0, scroll*3);
             repaint
                 mouse(x, y);
                 T.mouse(text, x, y);
                 repaint
             END
         END;
-		IF Scroll.isActive(hScroll) THEN
-			mouse(x, y);
-			Scroll.MouseMove(hScroll, x + LEFT, y + TOP);
-            T.getScroll(text, scrollX, scrollY);
-            T.scroll(text, hScroll.value - scrollX, 0);
-			repaint
-		END;
-		IF Scroll.isActive(vScroll) THEN
+		Scroll.mouse(hScroll);
-			mouse(x, y);
+		Scroll.mouse(vScroll);
-			Scroll.MouseMove(vScroll, x + LEFT, y + TOP);
-            T.getScroll(text, scrollX, scrollY);
+        T.getScroll(text, scrollX, scrollY);
-            T.scroll(text, 0, vScroll.value - scrollY);
+        IF (hScroll.value # scrollX) OR (vScroll.value # scrollY) THEN
+			T.scroll(text, hScroll.value - scrollX, vScroll.value - scrollY);
-			repaint
+        	repaint
-		END;
+        END;
         IF (8 IN msState) & ~(24 IN msState) THEN
             mouse(firstClickX, firstClickY);
             time := click(firstClickX, firstClickY)
         END;
         IF 9 IN msState THEN
             ShowMenu(context)
         END;
         IF 24 IN msState THEN
             mouse(x, y);
-    		Scroll.MouseDown(hScroll, x + LEFT, y + TOP);
-    		Scroll.MouseDown(vScroll, x + LEFT, y + TOP);
-    		IF search & searchOpened THEN
-	    		CheckBox.MouseDown(BKW, x + LEFT, y + TOP);
-	    		CheckBox.MouseDown(CS,  x + LEFT, y + TOP);
-	    		CheckBox.MouseDown(WH,  x + LEFT, y + TOP);
-    		END;
-            IF (ABS(x - firstClickX) < 5) & (ABS(y - firstClickY) < 5) THEN
+            IF U.between(-4, x - firstClickX, 4) & U.between(-4, y - firstClickY, 4) THEN
-                IF (0 <= x) & (x < canvas.width) & (0 <= y) & (y < canvas.height) THEN
+                IF U.between(0, x, canvas.width - 1) & U.between(0, y, canvas.height - 1) THEN
                     leftButton := FALSE;
                     T.selectWord(text);
                     repaint
                 END
             ELSE
                 time := click(firstClickX, firstClickY)
             END
         END
     END;
     IF search & searchOpened THEN
+	    CheckBox.mouse(BKW);
+    	CheckBox.mouse(CS);
+    	CheckBox.mouse(WH);
         EditBox(FindEdit);
         EditBox(ReplaceEdit);
         EditBox(GotoEdit);
-        IF CS.value # cs THEN
+        IF (CS.value # cs) OR (WH.value # whole) THEN
-            cs := ~cs;
+            cs := CS.value;
-            notFound := ~T.search(text, searchText, cs, whole);
-            repaint
-        END;
-        IF WH.value # whole THEN
-            whole := ~whole;
+            whole := WH.value;
             notFound := ~T.search(text, searchText, cs, whole);
             repaint
         END
     END;
     resized := FALSE
         draw_window
     END
 END Redraw;
+PROCEDURE ScrollChange;
+BEGIN
+	Scroll.change(hScroll);
+	Scroll.change(vScroll);
+	T.scroll(text, ORD(hScroll.Inc) - ORD(hScroll.Dec), ORD(vScroll.Inc) - ORD(vScroll.Dec));
+	IF menuActive THEN
+		draw_window;
+		menuActive := FALSE
+	ELSE
+		repaint
+	END
+END ScrollChange;
 PROCEDURE main;
 VAR
     err: INTEGER;
     fileName, filePath: RW.tFileName;
     width, height, cliWidth, cliHeight: INTEGER;
     resized: BOOLEAN;
-    firstClickX, firstClickY, time: INTEGER;
-BEGIN
+    firstClickX, firstClickY, time: INTEGER;
-	delay := Scroll.Delay;
+BEGIN
     K.GetSystemColors;
     Icons.get(icons, grayIcons);
     modified := FALSE;
     curText := 0;
     mainTID := K.ThreadID();
     K.SetIPC(IPC);
     U.ptr2str(K.GetName(), AppPath);
     Ini.load(AppPath);
-    LeftButtonUp;
+    leftButton := FALSE;
     resized := FALSE;
     K.ScreenSize(winWidth, winHeight);
     winWidth := (winWidth*80) DIV 100 - (128 + 30);
     winHeight := winHeight - (128 + 30);
     winWidth := MAX(winWidth, minWinWidth);
             U.getPath(fileName, filePath)
         END
     END;
     OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
     insert(0, text);
+    Scroll.init(ScrollChange);
     Scroll.create(FALSE, canvas.width + 1, scrollWidth, scrollWidth, scrollWidth, hScroll);
     Scroll.create(TRUE, scrollWidth, canvas.height + 1, scrollWidth, scrollWidth, vScroll);
     T.resize(canvas.width, canvas.height);
     T.SetPos(text, 0, 0);
     confirm := FALSE;

Subversion Repositories Kolibri OS

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