Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added terminal colours and updated version #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added terminal colours and updated version #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f421c09
Added terminal colours and updated version. Now you can add a vector …
Folcon Jan 16, 2014
304b3a8
updated lanterna to work with new colours, TODO: Issues with display …
Folcon Jan 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
(defproject clojure-lanterna "0.9.4"
(defproject org.clojars.folcon/clojure-lanterna "0.9.5-SNAPSHOT"
:description "A Clojure wrapper around the Lanterna terminal output library."
:url "http://sjl.bitbucket.org/clojure-lanterna/"
:license {:name "LGPL"}
:dependencies [[org.clojure/clojure "1.4.0"]
[com.googlecode.lanterna/lanterna "2.1.5"]]
:dependencies [[org.clojure/clojure "1.5.1"]
;[com.googlecode.lanterna/lanterna "2.1.7"]
[org.clojars.folcon/lanterna "3.0.0-SNAPSHOT"]]
:java-source-paths ["./java"]
; :repositories {"sonatype-snapshots" "https://oss.sonatype.org/content/repositories/snapshots"}
)
19 changes: 10 additions & 9 deletions src/lanterna/constants.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
com.googlecode.lanterna.TerminalFacade
com.googlecode.lanterna.screen.Screen
com.googlecode.lanterna.terminal.Terminal
com.googlecode.lanterna.terminal.TextColor
com.googlecode.lanterna.screen.ScreenCharacterStyle
com.googlecode.lanterna.terminal.swing.TerminalPalette
com.googlecode.lanterna.input.Key))
Expand All @@ -11,15 +12,15 @@
(def charsets {:utf-8 (Charset/forName "UTF-8")})

(def colors
{:black com.googlecode.lanterna.terminal.Terminal$Color/BLACK
:white com.googlecode.lanterna.terminal.Terminal$Color/WHITE
:red com.googlecode.lanterna.terminal.Terminal$Color/RED
:green com.googlecode.lanterna.terminal.Terminal$Color/GREEN
:blue com.googlecode.lanterna.terminal.Terminal$Color/BLUE
:cyan com.googlecode.lanterna.terminal.Terminal$Color/CYAN
:magenta com.googlecode.lanterna.terminal.Terminal$Color/MAGENTA
:yellow com.googlecode.lanterna.terminal.Terminal$Color/YELLOW
:default com.googlecode.lanterna.terminal.Terminal$Color/DEFAULT})
{:black com.googlecode.lanterna.terminal.TextColor$ANSI/BLACK
:white com.googlecode.lanterna.terminal.TextColor$ANSI/WHITE
:red com.googlecode.lanterna.terminal.TextColor$ANSI/RED
:green com.googlecode.lanterna.terminal.TextColor$ANSI/GREEN
:blue com.googlecode.lanterna.terminal.TextColor$ANSI/BLUE
:cyan com.googlecode.lanterna.terminal.TextColor$ANSI/CYAN
:magenta com.googlecode.lanterna.terminal.TextColor$ANSI/MAGENTA
:yellow com.googlecode.lanterna.terminal.TextColor$ANSI/YELLOW
:default com.googlecode.lanterna.terminal.TextColor$ANSI/DEFAULT})

(def styles
{:bold ScreenCharacterStyle/Bold
Expand Down
11 changes: 8 additions & 3 deletions src/lanterna/screen.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(ns lanterna.screen
(:import com.googlecode.lanterna.screen.Screen
com.googlecode.lanterna.terminal.Terminal)
com.googlecode.lanterna.terminal.Terminal
com.googlecode.lanterna.terminal.TextColor)
(:use [lanterna.common :only [parse-key block-on]])
(:require [lanterna.constants :as c]
[lanterna.terminal :as t]))
Expand Down Expand Up @@ -142,6 +143,10 @@
[^Screen screen x y]
(.setCursorPosition screen x y))

(defn get-color [color]
(cond (keyword? color) ^com.googlecode.lanterna.terminal.TextColor$ANSI (c/colors color)
(vector? color) (let [[r g b] color] (com.googlecode.lanterna.terminal.TextColor$RGB. r g b))))

(defn put-string
"Put a string on the screen buffer, ready to be drawn at the next redraw.

Expand Down Expand Up @@ -172,8 +177,8 @@
(let [styles ^clojure.lang.PersistentHashSet (set (map c/styles styles))
x (int x)
y (int y)
fg ^com.googlecode.lanterna.terminal.Terminal$Color (c/colors fg)
bg ^com.googlecode.lanterna.terminal.Terminal$Color (c/colors bg)]
fg (get-color fg)
bg (get-color bg)]
(.putString screen x y s fg bg styles))))

(defn put-sheet
Expand Down
12 changes: 8 additions & 4 deletions src/lanterna/terminal.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,17 @@
(.clearScreen terminal)
(move-cursor terminal 0 0))


(defn set-fg-color [^Terminal terminal color]
(.applyForegroundColor terminal (c/colors color)))
(cond (integer? color) (.applyForegroundColor terminal color)
(keyword? color) (.applyForegroundColor terminal (c/colors color))
(vector? color) (let [[r g b] color] (.applyForegroundColor terminal r g b))
:else nil))

(defn set-bg-color [^Terminal terminal color]
(.applyBackgroundColor terminal (c/colors color)))

(cond (integer? color) (.applyBackgroundColor terminal color)
(keyword? color) (.applyBackgroundColor terminal (c/colors color))
(vector? color) (let [[r g b] color] (.applyBackgroundColor terminal r g b))
:else nil))

; TODO: Fix these.
(defn set-style
Expand Down