Paste From Clipboard

Data/Texts/en.dat

@@ -208,6 +208,7 @@ menuRedo "&Redo"
 menuCut "Cu&t"
 menuCopy "&Copy"
 menuPaste "&Paste"
+menuPasteClipboard "Pas&te From OS Clipboard"
 menuClear "C&lear"
 menuSelectAll "Select &All"
 menuUnselect "U&nselect"

Data/Texts/ru.dat

@@ -208,6 +208,7 @@ menuRedo "&Повтор"
 menuCut "&Вырезать"
 menuCopy "&Копировать"
 menuPaste "В&ставить"
+menuPasteClipboard "Вс&тавить из системного буфера"
 menuClear "&Удалить"
 menuSelectAll "В&ыделить всё"
 menuUnselect "С&нять выделение"

src/Editor.Mod

@@ -955,18 +955,22 @@ BEGIN e := c.app.windows;
   END
 END EditClear;
 
-PROCEDURE EditPaste*(c: OV.Control);
+PROCEDURE PasteText*(app: OV.App; s: ARRAY OF CHAR);
 VAR e: Editor;
 BEGIN
-  IF (c.app.windows # NIL) & (c.app.windows IS Editor) & (clipboard[0] # 0X)
-  THEN e := c.app.windows(Editor);
+  IF (app.windows # NIL) & (app.windows IS Editor) & (s[0] # 0X) THEN
+    e := app.windows(Editor);
     e.text.DeleteSelection;
-    e.text.Insert(clipboard, FALSE);
+    e.text.Insert(s, FALSE);
     IF e.text.y >= e.text.scrY + e.h - 2 THEN
       MoveScreen(e, e.text.y - e.h + 3 - e.text.scrY)
     END;
     PrintText(e)
   END
+END PasteText;
+
+PROCEDURE EditPaste*(c: OV.Control);
+BEGIN PasteText(c.app, clipboard) 
 END EditPaste;
 
 PROCEDURE EditSelectAll*(c: OV.Control);

src/FreeOberon.Mod

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Free Oberon.  If not, see <http://www.gnu.org/licenses/>.
 *)
-IMPORT T := TermBox, Files, Args, Utf8, Builder, Env, Debug,
+IMPORT T := TermBox, Files, Args, Utf8, Builder, Env, Debug, Graph,
        OV, Editor, Term, FoStrings, Config, Strings, Int, Out, Kernel;
 CONST
   (* Direction of Selection *)
@@ -650,6 +650,16 @@ BEGIN E := app.windows;
   END
 END CascadeWindows;
 
+PROCEDURE EditPasteClipboard*(c: OV.Control);
+VAR e: Editor.Editor;
+  s: ARRAY 50000 OF CHAR;
+BEGIN
+  IF (c.app.windows # NIL) & (c.app.windows IS Editor.Editor) THEN
+    T.GetClipboardText(s);
+    Editor.PasteText(app, s)
+  END
+END EditPasteClipboard;
+
 PROCEDURE InitIDE;
 VAR w: OV.Window;
   m, m2: OV.Menu;
@@ -692,6 +702,8 @@ BEGIN
   OV.Add(m, OV.NewMenu(s, 'Ctrl+C', OV.hCtrlC, Editor.EditCopy));
   FoStrings.Get('menuPaste', s);
   OV.Add(m, OV.NewMenu(s, 'Ctrl+V', OV.hCtrlV, Editor.EditPaste));
+  FoStrings.Get('menuPasteClipboard', s);
+  OV.Add(m, OV.NewMenu(s, 'Ctrl+Shift+V', OV.hCtrlShiftV, EditPasteClipboard));
   FoStrings.Get('menuClear', s);
   OV.Add(m, OV.NewMenu(s, 'Ctrl+Del', OV.hCtrlDel, Editor.EditClear));
   FoStrings.Get('menuSelectAll', s);

src/Graph.Mod

@@ -1418,7 +1418,7 @@ RETURN f END LoadFont;
 (** Clipboard **)
 
 PROCEDURE GetClipboardText*(win: Window; VAR s: ARRAY OF CHAR);
-TYPE P = POINTER [1] TO ARRAY 5000 OF SHORTCHAR;
+TYPE P = POINTER [1] TO ARRAY 50000 OF SHORTCHAR;
 VAR a: Al.ADRINT;
   p: P;
   q: ARRAY 20 OF SHORTCHAR;
@@ -1427,7 +1427,7 @@ BEGIN
   (*IF a = 0 THEN a := Al.get_clipboard_text(win.display) END; (*Allegro bug*)*)
   (*Out.String('PASTE DEBUG. a = ');Out.Int(a, 0);Out.Ln;*)
   IF a # 0 THEN p := SYSTEM.VAL(P, a); Utf8.Decode(p^, s);
-    Al.free_with_context(a, 27, 'Graph.Mod', 'GetClipboardText')
+    Al.free_with_context(a, 1430, 'Graph.Mod', 'GetClipboardText')
     (*;Utf8.Encode('Привет', q);
     ;IF Al.set_clipboard_text(win.display, SYSTEM.VAL(Al.ADRINT, SYSTEM.ADR(q))) THEN END*)
   ELSE s[0] := 0X

src/TermBox.Mod

@@ -801,6 +801,11 @@ BEGIN
   IF b # NIL THEN G.SetWindowIcon(screen, b) END
 END InitIcon;
 
+PROCEDURE GetClipboardText*(VAR s: ARRAY OF CHAR);
+BEGIN
+  IF screen # NIL THEN G.GetClipboardText(screen, s) ELSE s[0] := 0X END
+END GetClipboardText;
+
 PROCEDURE InitScreen;
 VAR W, H, dw, dh: INTEGER;
 BEGIN G.GetDesktopResolution(dw, dh);