WebSVN – Kolibri OS – Path Comparison – / – /programs/ Rev 9196 and /programs/ Rev 9197

Regard whitespace Rev 9196 → Rev 9197

/programs/develop/cedit/CEDIT
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /programs/develop/cedit/SRC/CEdit.ob07
 ,7 → 28,7
     RW, Ini, EB := EditBox, Icons, Tabs, Timer;
 CONST
-    header = "CEdit (17-sep-2021)";
+    header = "CEdit (21-sep-2021)";
     ShellFilter = "";
     EditFilter = "SH|ASM|TXT|INC|OB07|C|CPP|H|PAS|PP|LUA|INI|JSON";
 ,13 → 1087,39
 END Script;
-PROCEDURE ShowSearchPanel;
+PROCEDURE ShowSearchPanel (goto: BOOLEAN);
+VAR
+        i: INTEGER;
+        flag: BOOLEAN;
 BEGIN
+        flag := FALSE;
+        IF T.selected(text) & ~goto THEN
+                T.getSelectedText(text, new_searchText);
+                IF new_searchText # "" THEN
+                        i := 0;
+                        WHILE (new_searchText[i] # 0X) & (new_searchText[i] # Lines.TAB) DO
+                                INC(i)
+                        END;
+                        IF new_searchText[i] = 0X THEN
+                                searchText := new_searchText;
+                                EB.setValue(FindEdit, searchText);
+                                notFound := ~T.search(text, searchText, cs, whole);
+                                flag := TRUE
+                        END
+                END
+        END;
     IF ~search THEN
         Search
     ELSIF ~searchOpened THEN
         search := FALSE;
         Search
+    END;
+    IF flag THEN
+        SetFocus(FindEdit, FALSE)
+    ELSIF goto THEN
+                SetFocus(GotoEdit, TRUE)
+    ELSE
+        SetFocus(FindEdit, TRUE)
     END
 END ShowSearchPanel;
 ,8 → 1331,7
         T.redo(text);
         repaint
     |menuFind:
-        ShowSearchPanel;
-        SetFocus(FindEdit, TRUE)
+        ShowSearchPanel(FALSE)
     |menuFindNext:
         notFound := ~T.findNext(text, BKW.value);
         menuFindClicked := TRUE
 ,8 → 1339,7
         notFound := ~T.findNext(text, ~BKW.value);
         menuFindClicked := TRUE
     |menuGoto:
-        ShowSearchPanel;
-        SetFocus(GotoEdit, TRUE)
+        ShowSearchPanel(TRUE)
     |menuToggleBookmark:
         T.toggleLabel(text)
     |menuNextBookmark:
 ,12 → 1786,10
             SwitchTab((curText + 1) MOD textsCount)
         ELSIF (keyCode = 33) & ctrl THEN
             key := -1;
-            ShowSearchPanel;
-            SetFocus(FindEdit, TRUE)
+            ShowSearchPanel(FALSE)
         ELSIF (keyCode = 34) & ctrl THEN
             key := -1;
-            ShowSearchPanel;
-            SetFocus(GotoEdit, TRUE)
+            ShowSearchPanel(TRUE)
         ELSE
             IF EditBox_Focus(FindEdit) THEN
                 EB.key(FindEdit, key);
 ,7 → 1927,8
         save(text);
         repaint
     |btnSearch:
-        ShowSearchPanel
+        ShowSearchPanel(FALSE);
+        repaint
     |btnCloseSearch:
         Search
     |btnHideSearch:

 /programs/develop/cedit/SRC/EditBox.ob07
 ,9 → 19,13
 MODULE EditBox;
-IMPORT sys := SYSTEM, KOSAPI;
+IMPORT SYSTEM, KOSAPI, Encodings;
+CONST
+        MAX_LENGTH = 1024;
 TYPE
         tEditBox* = POINTER TO RECORD
 ,12 → 56,12
         key_proc: EditBoxKey;
         paint    *: PROCEDURE (eb: tEditBox);
         mouse    *: PROCEDURE (eb: tEditBox);
-        setValue *: PROCEDURE (eb: tEditBox; text: INTEGER);
+        _setValue  : PROCEDURE (eb: tEditBox; text: INTEGER);
 PROCEDURE _key (key: INTEGER; key_proc: EditBoxKey; text: tEditBox);
 BEGIN
-    sys.CODE(
+    SYSTEM.CODE(
 BH, 045H, 008H,   (*  mov     eax, dword [ebp +  8]  *)
 BH, 055H, 00CH,   (*  mov     edx, dword [ebp + 12]  *)
 BH, 04DH, 010H,   (*  mov     ecx, dword [ebp + 16]  *)
 ,7 → 87,7
     ASSERT(max < LEN(str));
     i := 0;
     REPEAT
-        sys.GET(ptr, str[i]);
+        SYSTEM.GET(ptr, str[i]);
         INC(i);
         INC(ptr)
     UNTIL (str[i - 1] = 0X) OR (i = max);
 ,6 → 95,21
 END getValue;
+PROCEDURE setValue* (text: tEditBox; str: ARRAY OF WCHAR);
+VAR
+        i: INTEGER;
+        temp: ARRAY MAX_LENGTH OF CHAR;
+BEGIN
+        ASSERT(LENGTH(str) < LEN(temp));
+        i := 0;
+        REPEAT
+                temp[i] := CHR(Encodings.UNI[ORD(str[i]), Encodings.CP866] MOD 256);
+                INC(i)
+        UNTIL str[i - 1] = 0X;
+        _setValue(text, SYSTEM.ADR(temp[0]))
+END setValue;
 PROCEDURE create* (tlx, tly, width, max_chars: INTEGER; editbox_interlock: tEditBox): tEditBox;
 VAR
     new_textbox: tEditBox;
 ,7 → 141,7
 BEGIN
         a := KOSAPI.GetProcAdr(name, Lib);
         ASSERT(a # 0);
-        sys.PUT(v, a)
+        SYSTEM.PUT(v, a)
 END GetProc;
 ,10 → 151,10
 BEGIN
         Lib := KOSAPI.LoadLib("/rd/1/lib/box_lib.obj");
         ASSERT(Lib # 0);
-        GetProc(Lib, sys.ADR(paint),    "edit_box");
-        GetProc(Lib, sys.ADR(key_proc), "edit_box_key");
-        GetProc(Lib, sys.ADR(mouse),    "edit_box_mouse");
-        GetProc(Lib, sys.ADR(setValue), "edit_box_set_text");
+        GetProc(Lib, SYSTEM.ADR(paint),     "edit_box");
+        GetProc(Lib, SYSTEM.ADR(key_proc),  "edit_box_key");
+        GetProc(Lib, SYSTEM.ADR(mouse),     "edit_box_mouse");
+        GetProc(Lib, SYSTEM.ADR(_setValue), "edit_box_set_text");
 END main;

 /programs/develop/cedit/SRC/Text.ob07
 ,6 → 1776,19
 END isWordChar;
+PROCEDURE getSelectedText* (text: tText; VAR s: ARRAY OF WCHAR);
+VAR
+    n: INTEGER;
+    selBeg, selEnd: tPoint;
+BEGIN
+        s[0] := 0X;
+    IF selected(text) & (text.cursor.Y = text.select.Y) THEN
+        getSelect(text, selBeg, selEnd);
+        n := getString(text.curLine, selBeg.X, selEnd.X - selBeg.X, s)
+    END
+END getSelectedText;
 PROCEDURE wordSel* (text: tText);
 VAR
     n, i, x1, x2: INTEGER;

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9196 → Rev 9197