CC:T term redirections

Author: neumond

computercraft/cc_peripherals/_base.py

@@ -19,4 +19,4 @@ def _call(self, method, *args):
         return eval_lua(b'G:peripheral:M:call', self._side, method, *args)
 
     def get_expr_code(self):
-        return b'peripheral.wrap("' + self._side.encode('ascii') + b'")'
+        return b'return peripheral.wrap("' + self._side.encode('ascii') + b'")'

examples/test_redirect_to_local_monitor.py

@@ -1,5 +1,3 @@
-from computercraft.cc.peripheral import CCMonitor
-from computercraft.cc.mixins import TermMixin
 from cc import import_file, colors, os, peripheral
 
 _lib = import_file('_lib.py', __file__)
@@ -14,23 +12,6 @@
 
 m = peripheral.wrap(side)
 assert m is not None
-
-
-tbl = _lib.get_object_table(f'peripheral.wrap("{side}")')
-
-# remove British method names to make API lighter
-del tbl['function']['getBackgroundColour']
-del tbl['function']['getPaletteColour']
-del tbl['function']['getTextColour']
-del tbl['function']['isColour']
-del tbl['function']['setBackgroundColour']
-del tbl['function']['setPaletteColour']
-del tbl['function']['setTextColour']
-# NOTE: peripheral doesn't have nativePaletteColor method
-
-assert _lib.get_multiclass_table(TermMixin, CCMonitor) == tbl
-
-
 assert m.getSize() == (7, 5)
 assert m.isColor() is True
 assert m.setTextColor(colors.white) is None

examples/test_redirect_to_window.py

@@ -0,0 +1,14 @@
+from cc import colors, term, peripheral
+
+
+side = 'left'
+input(f'Attach 3x3 color monitor to {side} side of computer [enter]')
+
+with term.redirect(peripheral.wrap(side)):
+    term.setBackgroundColor(colors.green)
+    term.setTextColor(colors.white)
+    term.clear()
+    term.setCursorPos(1, 1)
+    print('Redirected to monitor')
+
+print('Test finished successfully')

examples/test_peripheral_monitor.py tests/cc_programs/peripheral_monitor.pyexamples/test_peripheral_monitor.py renamed to tests/cc_programs/peripheral_monitor.py

@@ -1,22 +1,20 @@
-from cc import import_file, colors, term, peripheral
-
-_lib = import_file('_lib.py', __file__)
+from cc import colors, term, peripheral
 
 
 side = 'back'
-_lib.step(f'Attach wired modem to {side} side of computer')
+input(f'Attach wired modem to {side} side of computer [enter]')
 
 mod = peripheral.wrap(side)
 
-_lib.step('Connect remote monitor using wires, activate its modem')
+input('Connect remote monitor using wires, activate its modem [enter]')
 
 for name in mod.getNamesRemote():
     if mod.getTypeRemote(name) == 'monitor':
         break
 else:
     assert False
 
-with term.redirect(peripheral.get_term_target(name)):
+with term.redirect(peripheral.wrap(name)):
     term.setBackgroundColor(colors.blue)
     term.setTextColor(colors.white)
     term.clear()

tests/cc_programs/redirect_to_local_monitor.py

@@ -0,0 +1,25 @@
+from cc import colors, term, window
+
+
+w, h = term.getSize()
+left = window.create(
+    term.current(),
+    1, 1, w // 2, h, True)
+right = window.create(
+    term.current(),
+    w // 2 + 1, 1, w // 2, h, True)
+with term.redirect(left):
+    term.setBackgroundColor(colors.green)
+    term.setTextColor(colors.white)
+    term.clear()
+    term.setCursorPos(1, h // 2)
+    print('Left part')
+with term.redirect(right):
+    term.setBackgroundColor(colors.red)
+    term.setTextColor(colors.yellow)
+    term.clear()
+    term.setCursorPos(1, h // 2)
+    print('Right part')
+print('Default terminal restored')
+
+print('Test finished successfully')