interface name consistency

This commit is contained in:
2024-03-13 10:39:22 +01:00
parent 2ab5a38894
commit 4ab3d868c1
37 changed files with 94 additions and 94 deletions

View File

@@ -1,7 +1,7 @@
package kernel;
import lib.Pos;
import kernel.ui.TermWriteable;
import kernel.ui.ITermWriteable;
import cc.Term;
import lib.Vec.Vec2;
import lib.Color;
@@ -11,7 +11,7 @@ using tink.CoreApi;
/**
Represents the main computer screen.
**/
class MainTerm implements TermWriteable {
class MainTerm implements ITermWriteable {
/**
Depends on: KernelEvents,
**/

View File

@@ -1,12 +1,12 @@
package kernel.binstore;
import kernel.ps.Process;
import kernel.ps.IProcess;
/**
Represents a callable program.
**/
typedef Bin = {
c:Void->Process,
c:Void->IProcess,
name:String,
aliases:Array<String>,
}

View File

@@ -1,6 +1,6 @@
package kernel.binstore;
import kernel.ps.Process;
import kernel.ps.IProcess;
import macros.Binstore;
class BinStore {
@@ -13,7 +13,7 @@ class BinStore {
return bins;
}
public static function instantiate(alias:String):Null<Process> {
public static function instantiate(alias:String):Null<IProcess> {
for (bin in bins) {
for (a in bin.aliases) {
if (a == alias) {

View File

@@ -3,13 +3,13 @@ package kernel.peripherals;
import cc.Peripheral;
import lib.Pos;
import cc.Term.TerminalSize;
import kernel.ui.TermWriteable;
import kernel.ui.ITermWriteable;
import lib.Vec.Vec2;
import lib.Color;
using tink.CoreApi;
class Screen implements TermWriteable implements IPeripheral {
class Screen implements ITermWriteable implements IPeripheral {
public static inline final TYPE_NAME:String = "monitor";
private final nativ:cc.periphs.Monitor.Monitor;

View File

@@ -3,6 +3,6 @@ package kernel.ps;
/**
Defines an independent process that can be run by the kernel.
**/
interface Process {
interface IProcess {
public function run(handle:ProcessHandle):Void;
}

View File

@@ -10,7 +10,7 @@ typedef PID = Int;
class ProcessManager {
private static final processList = new Map<PID, ProcessHandle>();
public static function run(process:Process, config:HandleConfig):PID {
public static function run(process:IProcess, config:HandleConfig):PID {
var pid = createPID();
var handle = new ProcessHandle(config, pid);

View File

@@ -1,6 +1,6 @@
package kernel.service;
import kernel.ps.Process;
import kernel.ps.IProcess;
import kernel.ps.ProcessManager;
import kernel.binstore.BinStore;
@@ -11,7 +11,7 @@ class Service {
public final name:String;
public final args:Array<String>;
public var pid:PID;
public var ps:Process;
public var ps:IProcess;
@:allow(kernel.service.ServiceManager)
private function new(binName:String, name:String, ?args:Array<String>) {

View File

@@ -3,7 +3,7 @@ package kernel.ui;
import lib.Pos;
import lib.Vec.Vec2;
import lib.Color;
import kernel.ui.TermWriteable;
import kernel.ui.ITermWriteable;
using tink.CoreApi;
@@ -11,15 +11,15 @@ using tink.CoreApi;
A term writer that can switch beetween its internal buffer and another termwriter.
The other target is most of the time a real screen
**/
class BufferedVirtualTermWriter implements VirtualTermWriter extends TermBuffer {
class BufferedVirtualTermWriter implements IVirtualTermWriter extends TermBuffer {
private static final defaultSize:Vec2<Int> = {x: 50, y: 50};
private var target:TermWriteable;
private var target:ITermWriteable;
private var enabled:Bool = false;
private var onResizeLink:CallbackLink;
@:allow(kernel.ui)
private function new(?target:TermWriteable) {
private function new(?target:ITermWriteable) {
setTarget(target);
if (enabled) {
@@ -44,7 +44,7 @@ class BufferedVirtualTermWriter implements VirtualTermWriter extends TermBuffer
return enabled;
}
public function setTarget(newTarget:TermWriteable) {
public function setTarget(newTarget:ITermWriteable) {
if (newTarget != null) {
super.setSize(newTarget.getSize());

View File

@@ -9,7 +9,7 @@ using tink.CoreApi;
/**
Interface describing a terminal. E.g. the main computer screen or a external screen.
**/
interface TermWriteable {
interface ITermWriteable {
public var onResize(default, null):Signal<Vec2<Int>>;
public function write(text:String):Void;

View File

@@ -4,9 +4,9 @@ package kernel.ui;
A VirtualTermWriter is a TermWriteable that can be enabled or disabled.
When disabled, it will not write to its target. When enabled, it will.
**/
interface VirtualTermWriter extends TermWriteable {
interface IVirtualTermWriter extends ITermWriteable {
public function enable():Void;
public function disable():Void;
public function isEnabled():Bool;
public function setTarget(newTarget:TermWriteable):Void;
public function setTarget(newTarget:ITermWriteable):Void;
}

View File

@@ -13,18 +13,18 @@ using tink.CoreApi;
The render function is only called when needed.
You can also request a re-render by calling `requestRender`.
**/
class StatelessVirtualTermWriter implements VirtualTermWriter {
class StatelessVirtualTermWriter implements IVirtualTermWriter {
public var onResize(default, null):Signal<Vec2<Int>>;
private var onResizeTrigger:SignalTrigger<Vec2<Int>> = Signal.trigger();
private var target:TermWriteable;
private var target:ITermWriteable;
private var enabled:Bool = false;
private var renderFunc:Null<Void->Void> = null;
private var renderRequested:Bool = false;
private var onResizeLink:CallbackLink;
@:allow(kernel.ui)
private function new(?target:TermWriteable) {
private function new(?target:ITermWriteable) {
onResize = onResizeTrigger.asSignal();
setTarget(target);
}
@@ -70,7 +70,7 @@ class StatelessVirtualTermWriter implements VirtualTermWriter {
enabled = false;
}
public function setTarget(newTarget:TermWriteable) {
public function setTarget(newTarget:ITermWriteable) {
if (newTarget == null) {
return;
}

View File

@@ -3,7 +3,7 @@ package kernel.ui;
import lib.Pos;
import lib.Vec.Vec2;
import lib.Color;
import kernel.ui.TermWriteable;
import kernel.ui.ITermWriteable;
using tink.CoreApi;
@@ -12,7 +12,7 @@ using tink.CoreApi;
even if its not displayed right now. When the GUI gets displayed again
this buffer will be written to the screen.
**/
class TermBuffer implements TermWriteable {
class TermBuffer implements ITermWriteable {
/**
format [y][x]. First index is the line. Second index the char in the line.
**/
@@ -60,7 +60,7 @@ class TermBuffer implements TermWriteable {
}
}
private function copyBufferToTarget(target:TermWriteable) {
private function copyBufferToTarget(target:ITermWriteable) {
target.setCursorPos(0, 0);
target.setBackgroundColor(Black);
target.setTextColor(White);

View File

@@ -1,21 +1,21 @@
package kernel.ui;
import lib.ui.rendere.UIEventDelegate;
import lib.ui.rendere.IUIEventDelegate;
import lib.Pos;
import lib.Color;
import kernel.ButtonType;
import lib.Vec.Vec2;
import kernel.ui.TermWriteable;
import kernel.ui.ITermWriteable;
using tink.CoreApi;
/**
The main object you interact with when writing anything to the screen.
**/
class WindowContext implements TermWriteable {
private final writer:VirtualTermWriter;
class WindowContext implements ITermWriteable {
private final writer:IVirtualTermWriter;
@:allow(kernel.ui.WindowManager) private var eventDelegate:Null<UIEventDelegate>;
@:allow(kernel.ui.WindowManager) private var eventDelegate:Null<IUIEventDelegate>;
public var onClick(default, null):Signal<{button:ButtonType, pos:Pos}>;
public var onKey(default, null):Signal<{keyCode:Int, isHeld:Bool}>;
@@ -36,7 +36,7 @@ class WindowContext implements TermWriteable {
@:allow(kernel.ui.WindowManager) private final onCharTrigger:SignalTrigger<String>;
@:allow(kernel.ui.WindowManager)
private function new(writer:VirtualTermWriter) {
private function new(writer:IVirtualTermWriter) {
this.writer = writer;
this.onResize = writer.onResize;
@@ -62,7 +62,7 @@ class WindowContext implements TermWriteable {
public var onResize(default, null):Signal<Vec2<Int>>;
@:allow(kernel.ui)
private inline function setTarget(target:TermWriteable) {
private inline function setTarget(target:ITermWriteable) {
writer.setTarget(target);
}
@@ -145,7 +145,7 @@ class WindowContext implements TermWriteable {
Delegate events to an UIEventDelegate.
Set to null to stop delegating events.
**/
public inline function delegateEvents(delegate:Null<UIEventDelegate>) {
public inline function delegateEvents(delegate:Null<IUIEventDelegate>) {
this.eventDelegate = delegate;
}
}

View File

@@ -3,7 +3,7 @@ package kernel.ui;
import kernel.ps.ProcessManager;
import kernel.ps.ProcessManager.PID;
import haxe.ds.ReadOnlyArray;
import kernel.ui.TermWriteable;
import kernel.ui.ITermWriteable;
import kernel.peripherals.Peripherals.Peripheral;
/**
@@ -143,7 +143,7 @@ class WindowManager {
Move context to output. If output is "main", context will be moved to main screen.
**/
public static function focusContextToOutput(context:WindowContext, output:String) {
var target:TermWriteable;
var target:ITermWriteable;
if (output == "main") {
target = MainTerm.instance;
currentMainContext = context;