diff --git a/deps.edn b/deps.edn index 187212e7..3e88a5ba 100644 --- a/deps.edn +++ b/deps.edn @@ -2,6 +2,7 @@ "feature-yaml" "feature-csv" "feature-transit" "feature-java-time" "feature-java-nio" "feature-httpkit-client" "feature-httpkit-server" + "feature-lanterna" "sci/src" "babashka.curl/src" "babashka.pods/src" "babashka.nrepl/src" "depstar/src" @@ -23,7 +24,8 @@ org.postgresql/postgresql {:mvn/version "42.2.12"} org.hsqldb/hsqldb {:mvn/version "2.4.0"} datascript/datascript {:mvn/version "0.18.11"} - http-kit/http-kit {:mvn/version "2.5.0"}} + http-kit/http-kit {:mvn/version "2.5.0"} + babashka/clojure-lanterna {:mvn/version "0.9.8-SNAPSHOT"}} :aliases {:main {:main-opts ["-m" "babashka.main"]} :profile diff --git a/doc/build.md b/doc/build.md index ff9c0f67..31e439e9 100644 --- a/doc/build.md +++ b/doc/build.md @@ -135,7 +135,7 @@ Example program: ``` clojure (require '[lanterna.terminal :as terminal]) -(def terminal (terminal/text-terminal)) +(def terminal (terminal/get-terminal)) (terminal/start terminal) (terminal/put-string terminal "Hello TUI Babashka!" 10 5) diff --git a/feature-lanterna/babashka/impl/lanterna.clj b/feature-lanterna/babashka/impl/lanterna.clj index 09b061d7..497cd9ee 100644 --- a/feature-lanterna/babashka/impl/lanterna.clj +++ b/feature-lanterna/babashka/impl/lanterna.clj @@ -4,17 +4,16 @@ [lanterna.constants] [lanterna.screen] [lanterna.terminal] - [sci.impl.namespaces :refer [copy-var]] - [sci.impl.vars :as vars])) + [sci.core :as sci :refer [copy-var]])) -(def tns (vars/->SciNamespace 'lanterna.terminal nil)) -(def sns (vars/->SciNamespace 'lanterna.screen nil)) -(def cns (vars/->SciNamespace 'lanterna.screen nil)) +(def tns (sci/create-ns 'lanterna.terminal nil)) +(def sns (sci/create-ns 'lanterna.screen nil)) +(def cns (sci/create-ns 'lanterna.screen nil)) (def lanterna-terminal-namespace {'add-resize-listener (copy-var lanterna.terminal/add-resize-listener tns) 'remove-resize-listener (copy-var lanterna.terminal/remove-resize-listener tns) - 'text-terminal (copy-var lanterna.terminal/text-terminal tns) + 'get-terminal (copy-var lanterna.terminal/get-terminal tns) 'start (copy-var lanterna.terminal/start tns) 'stop (copy-var lanterna.terminal/stop tns) 'get-size (copy-var lanterna.terminal/get-size tns)