start using tinker

src/kernel/ui/WindowContext.hx

@@ -1,7 +1,8 @@
 package kernel.ui;
 
+using tink.CoreApi;
+
 import util.Color;
-import util.Signal;
 import kernel.ui.WindowManager.ButtonType;
 import util.Vec.Vec2;
 import lib.TermWriteable;
@@ -9,31 +10,46 @@ import lib.TermWriteable;
 class WindowContext implements TermWriteable {
     private final writer:VirtualTermWriter;
 
-    private final _clickSignal:Signal<{button: ButtonType, pos: Vec2<Int>}> = new Signal();
-    private final _keySignal:Signal<{keyCode: Int, isHeld: Bool}> = new Signal();
-    private final _keyUpSignal:Signal<Int> = new Signal();
-    private final _mouseDragSignal:Signal<{button: ButtonType, pos: Vec2<Int>}> = new Signal();
-    private final _mouseScrollSignal:Signal<{dir: Int,pos: Vec2<Int>}> = new Signal();
-    private final _mouseUpSignal:Signal<{button: ButtonType,pos: Vec2<Int>}> = new Signal();
-    private final _pasteSignal:Signal<String> = new Signal(); 
+    public var clickSignal(default,null):Signal<{button: ButtonType, pos: Vec2<Int>}>;
+    public var keySignal(default,null):Signal<{keyCode: Int, isHeld: Bool}>;
+    public var keyUpSignal(default,null):Signal<Int>;
+    public var mouseDragSignal(default,null):Signal<{button: ButtonType, pos: Vec2<Int>}>;
+    public var mouseScrollSignal(default,null):Signal<{dir: Int,pos: Vec2<Int>}>;
+    public var mouseUpSignal(default,null):Signal<{button: ButtonType,pos: Vec2<Int>}>;
+    public var pasteSignal(default,null):Signal<String> ;
+
+    @:allow(kernel.ui.WindowManager) private final clickTrigger:SignalTrigger<{button: ButtonType, pos: Vec2<Int>}>;
+    @:allow(kernel.ui.WindowManager) private final keyTrigger:SignalTrigger<{keyCode: Int, isHeld: Bool}>;
+    @:allow(kernel.ui.WindowManager) private final keyUpTrigger:SignalTrigger<Int>;
+    @:allow(kernel.ui.WindowManager) private final mouseDragTrigger:SignalTrigger<{button: ButtonType, pos: Vec2<Int>}>;
+    @:allow(kernel.ui.WindowManager) private final mouseScrollTrigger:SignalTrigger<{dir: Int,pos: Vec2<Int>}>;
+    @:allow(kernel.ui.WindowManager) private final mouseUpTrigger:SignalTrigger<{button: ButtonType,pos: Vec2<Int>}>;
+    @:allow(kernel.ui.WindowManager) private final pasteTrigger:SignalTrigger<String>;
 
-    public var clickSignal(get,null):SignalReadonly<{button: ButtonType, pos: Vec2<Int>}>;
-    public var keySignal(get,null):SignalReadonly<{keyCode: Int, isHeld: Bool}>;
-    public var keyUpSignal(get,null):SignalReadonly<Int>;
-    public var mouseDragSignal(get,null):SignalReadonly<{button: ButtonType, pos: Vec2<Int>}>;
-    public var mouseScrollSignal(get,null):SignalReadonly<{dir: Int,pos: Vec2<Int>}>;
-    public var mouseUpSignal(get,null):SignalReadonly<{button: ButtonType,pos: Vec2<Int>}>;
-    public var pasteSignal(get,null):SignalReadonly<String> ;
 
     public function new(writer: VirtualTermWriter) {
         this.writer = writer;
+        this.onResize = writer.onResize;
+
+        this.clickTrigger = Signal.trigger();
+        this.keyTrigger = Signal.trigger();
+        this.keyUpTrigger = Signal.trigger();
+        this.mouseDragTrigger = Signal.trigger();
+        this.mouseScrollTrigger = Signal.trigger();
+        this.mouseUpTrigger = Signal.trigger();
+        this.pasteTrigger = Signal.trigger();
+
+        this.clickSignal = clickTrigger.asSignal();
+        this.keySignal = keyTrigger.asSignal();
+        this.keyUpSignal = keyUpTrigger.asSignal();
+        this.mouseDragSignal = mouseDragTrigger.asSignal();
+        this.mouseScrollSignal = mouseScrollTrigger.asSignal();
+        this.mouseUpSignal = mouseUpTrigger.asSignal();
+        this.pasteSignal = pasteTrigger.asSignal();
+
     }
 
-    public var onResize(get, null):SignalReadonly<Vec2<Int>>;
-
-	function get_onResize():SignalReadonly<Vec2<Int>> {
-		return writer.onResize;
-	}
+    public var onResize(default, null):Signal<Vec2<Int>>;
 
     @:allow(kernel.ui)
     private function setTarget(target: TermWriteable) {
@@ -55,69 +71,6 @@ class WindowContext implements TermWriteable {
         return writer.isEnabled();
     }
 
-    public function get_clickSignal(){
-        return _clickSignal;
-    }
-
-    public function get_keySignal(){
-        return _keySignal;
-    }
-
-    public function get_keyUpSignal(){
-        return _keyUpSignal;
-    }
-
-    public function get_mouseDragSignal(){
-        return _mouseDragSignal;
-    }
-
-    public function get_mouseScrollSignal(){
-        return _mouseScrollSignal;
-    }
-
-    public function get_mouseUpSignal(){
-        return _mouseUpSignal;
-    }
-
-    public function get_pasteSignal(){
-        return _pasteSignal;
-    }
-
-    @:allow(kernel.ui.WindowManager) // Package private
-    private function click(button:ButtonType ,pos: Vec2<Int>) {
-        _clickSignal.emit({button: button,pos: pos});
-    }
-
-    @:allow(kernel.ui.WindowManager) // Package private
-    private function key(keyCode: Int, isHeld: Bool) {
-        _keySignal.emit({keyCode: keyCode,isHeld: isHeld});
-    }
-
-    @:allow(kernel.ui.WindowManager) // Package private
-    private function keyUp(keyCode: Int) {
-        _keyUpSignal.emit(keyCode);
-    }
-
-    @:allow(kernel.ui.WindowManager) // Package private
-    private function mouseDrag(button: ButtonType, pos: Vec2<Int>) {
-        _mouseDragSignal.emit({button: button,pos: pos});
-    }
-
-    @:allow(kernel.ui.WindowManager) // Package private
-    private function mouseScroll(dir: Int,pos: Vec2<Int>) {
-        _mouseScrollSignal.emit({dir: dir,pos: pos});
-    }
-
-    @:allow(kernel.ui.WindowManager) // Package private
-    private function mouseUp(button: ButtonType,pos: Vec2<Int>) {
-        _mouseUpSignal.emit({button: button,pos: pos});
-    }
-
-    @:allow(kernel.ui.WindowManager) // Package private
-    private function paste(text: String) {
-        _pasteSignal.emit(text);
-    }
-
 	public function write(text:String) {
         writer.write(text);
     }