thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diverge

Browse Source
This commit is contained in:
anton.gurov 2019-10-25 11:27:47 +03:00
parent 8126e68141
commit 56f3447666
4 changed files with 137 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.go
View File

@ -34,12 +34,16 @@ func mainLoop(ctx util.ClientCtx) {
var exit = false
baseLayer := mainwindow.AddLayer(0,"white")
bgLayer := mainwindow.AddLayer(1,"white")
menuLayer := mainwindow.AddLayer(2, "white")
upperBaseLayer := mainwindow.AddLayer(1, "red")
menuBgLayer := mainwindow.AddLayer(2,"white")
menuLayer := mainwindow.AddLayer(3, "white")
baseLayer.WithColor("white").NewRect( 3,0, 17, 6).Fill()
baseLayer.WithColor("grey").NewRect( 22,0, 38, 6).Splash()
baseLayer.WithColor("blue").NewRect( 3,8, 57, 6).Fill()
menuLayer.WithColor("#99de7c26").NewRect(50, 1, 10, 10).Splash()
upperBaseLayer.WithColor("#99de7c26").NewRect(50, 1, 10, 10).Splash()
menuLayer.WithColor("#aa26edca").DrawWindow("Testing with long title", 0,5, 40, 20)
blt.PrintExt(1, 6, 40, 19, 1, `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Odio morbi quis commodo odio aenean sed. Egestas sed sed risus pretium quam vulputate dignissim suspendisse in. Viverra nam libero justo laoreet sit amet cursus sit. Sed egestas egestas fringilla phasellus faucibus. Ultrices neque ornare aenean euismod elementum nisi quis eleifend. Eget lorem dolor sed viverra ipsum nunc aliquet bibendum. Egestas maecenas pharetra convallis posuere morbi. In hac habitasse platea dictumst quisque. Aenean vel elit scelerisque mauris pellentesque pulvinar.
@ -52,7 +56,7 @@ Cursus in hac habitasse platea. Aliquet risus feugiat in ante metus dictum. Maec
Sed euismod nisi porta lorem mollis aliquam ut porttitor leo. Ut tellus elementum sagittis vitae et leo duis ut diam. Elementum curabitur vitae nunc sed velit dignissim. Auctor elit sed vulputate mi sit. Consectetur adipiscing elit ut aliquam purus. Feugiat vivamus at augue eget arcu. Duis ut diam quam nulla porttitor massa id neque. Pharetra magna ac placerat vestibulum lectus mauris ultrices. Non sodales neque sodales ut etiam. Massa ultricies mi quis hendrerit dolor. Est sit amet facilisis magna etiam. Ornare suspendisse sed nisi lacus sed viverra tellus in.
`)
bgLayer.WithColor("#77cfcfcf").NewRect(45, 5, 40, 40).Splash()
menuBgLayer.WithColor("#77cfcfcf").NewRect(45, 5, 40, 40).Splash()
menuLayer.WithColor("#aaed26ca").DrawWindow("Transparent BG window test",45, 5, 40, 40)
blt.PrintExt(46, 6, 40, 39, 1, `Lorem mollis aliquam ut porttitor leo a diam sollicitudin tempor. Convallis tellus id interdum velit. Enim nunc faucibus a pellentesque. Tincidunt augue interdum velit euismod in pellentesque massa placerat duis. Leo duis ut diam quam nulla porttitor massa id. Eu feugiat pretium nibh ipsum consequat nisl. Eget est lorem ipsum dolor sit amet. Et sollicitudin ac orci phasellus egestas. Donec adipiscing tristique risus nec. Et molestie ac feugiat sed. Ante in nibh mauris cursus mattis molestie a iaculis at. Neque laoreet suspendisse interdum consectetur. Vitae et leo duis ut diam quam nulla. Sed ullamcorper morbi tincidunt ornare massa eget egestas purus viverra. Ornare lectus sit amet est placerat in egestas erat.

12
ui/mainwindow/console.go Normal file
View File

@ -0,0 +1,12 @@
package mainwindow
//Console is a pair of layers (BG and FG) used to render something
// All because of lack of background colors in libbearterminal
type Console struct {
x,y,w,h int
FgLayer *Layer
BgLayer *Layer
}
func NewConsole

136
ui/mainwindow/layer.go
View File

@ -2,160 +2,64 @@ package mainwindow
import blt "lab.zaar.be/thefish/bearlibterminal"
var emptyCorners = [4]uint32{0,0,0,0}
type LayerInterface interface {
Render()
Put(x, y int, symbol rune, color string)
}
type LayerInterfaceImpl struct {
type Layer struct {
idx int
defaultColor uint32
}
func AddLayer(idx int, colorName string) LayerInterfaceImpl {
func AddLayer(idx int, colorName string) Layer {
c := blt.ColorFromName(colorName)
return LayerInterfaceImpl{idx: idx, defaultColor: c}
return Layer{idx: idx, defaultColor: c}
}
func (lii *LayerInterfaceImpl) before() *LayerInterfaceImpl {
blt.Layer(lii.idx)
return lii
func (layer *Layer) before() *Layer {
blt.Layer(layer.idx)
return layer
}
func (lii *LayerInterfaceImpl) WithColor(colorName string) *LayerInterfaceImpl {
lii.before()
func (layer *Layer) WithColor(colorName string) *Layer {
layer.before()
c := blt.ColorFromName(colorName)
blt.Color(c)
return lii
return layer
}
func (lii *LayerInterfaceImpl) after() *LayerInterfaceImpl {
blt.Color(lii.defaultColor)
func (layer *Layer) after() *Layer {
blt.Color(layer.defaultColor)
blt.Layer(0)
return lii
return layer
}
func (lii LayerInterfaceImpl) Put(x,y int, symbol string) {
func (layer Layer) Put(x,y int, symbol string) {
rnes := []rune(symbol)
if (len(rnes)) > 0 {
blt.Put(x, y, int(rnes[0]))
}
}
func (lii LayerInterfaceImpl) Print(x,y int, txt string) (w,h int) {
func (layer Layer) Print(x,y int, txt string) (w,h int) {
return blt.Print(x,y, txt)
}
type Rect struct {
x,y,w,h int
layer *LayerInterfaceImpl
}
type rectFill struct {
top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight, body string
}
func (lii *LayerInterfaceImpl) NewRect(x,y,w,h int) *Rect {
return &Rect{x,y,w,h, lii}
}
var noborder = rectFill{
top: "▄",
bottom: "▀",
left: "▐",
right: "▌",
topLeft: "▗",
topRight: "▖",
bottomLeft: "▝",
bottomRight: "▘",
body: "█",
}
var splash = rectFill{
top: "█",
bottom: "█",
left: "█",
right: "█",
topLeft: "█",
topRight: "█",
bottomLeft: "█",
bottomRight: "█",
body: "█",
}
var doubleBorder = rectFill {
top: "═",
bottom: "═",
left: "║",
right: "║",
topLeft: "╔",
topRight: "╗",
bottomLeft: "╚",
bottomRight: "╝",
}
func (r *Rect) Fill() {
r.render(noborder)
}
func (r *Rect) Splash() {
r.render(splash)
}
func (r *Rect) DrawBorder() {
r.render(doubleBorder)
}
func (r *Rect) render (fillage rectFill) {
if fillage.body != "" {
for i := r.x + 1; i < r.x+r.w; i++ {
for j := r.y + 1; j < r.y+r.h; j++ {
r.layer.Put(i, j, fillage.body);
//lii.Put(i, j, "X");
}
}
}
for i := r.x + 1; i < r.x+r.w; i++ {
r.layer.Put(i, r.y, fillage.top);
//lii.Put(i, y-1, "Q");
r.layer.Put(i, r.y+r.h, fillage.bottom);
//lii.Put(i, y+h, "H");
}
for j := r.y + 1; j < r.y+r.h; j++ {
r.layer.Put(r.x, j, fillage.left);
//lii.Put(x-1, j, "U");
r.layer.Put(r.x+r.w, j, fillage.right);
//lii.Put(x+w, j, "M");
}
r.layer.Put(r.x, r.y, fillage.topLeft);
//lii.Put(x-1, y-1, "T");
r.layer.Put(r.x, r.y+r.h, fillage.bottomLeft);
//lii.Put(x-1, y+h, "q");
r.layer.Put(r.x+r.w, r.y, fillage.topRight);
//lii.Put(x+w, y-1, "L");
r.layer.Put(r.x+r.w, r.y+r.h, fillage.bottomRight);
};
func (lii LayerInterfaceImpl) DrawWindow (title string, x, y, w, h int) {
func (layer Layer) DrawWindow (title string, x, y, w, h int) {
if len(title) > (w -2) {
title = title[:(w-2)]
}
lii.NewRect(x,y,w,h).DrawBorder()
layer.NewRect(x,y,w,h).DrawBorder()
centerX := x + (w / 2)
lii.Print(centerX - (len(title) / 2) - 1, y, "╡" + title + "╞")
layer.Print(centerX - (len(title) / 2) - 1, y, "╡" + title + "╞")
};
func (lii *LayerInterfaceImpl) Decorate (f func (args ...interface{})) func (args ...interface{}) {
func (layer *Layer) Decorate (f func (args ...interface{})) func (args ...interface{}) {
return func (args ...interface{}) {
lii.before()
layer.before()
f(args)
lii.after()
layer.after()
}
}

97
ui/mainwindow/primitives.go Normal file
View File

@ -0,0 +1,97 @@
package mainwindow
type Rect struct {
x,y,w,h int
layer *Layer
}
type rectFill struct {
top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight, body string
}
func (layer *Layer) NewRect(x,y,w,h int) *Rect {
return &Rect{x,y,w,h, layer}
}
var noborder = rectFill{
top: "▄",
bottom: "▀",
left: "▐",
right: "▌",
topLeft: "▗",
topRight: "▖",
bottomLeft: "▝",
bottomRight: "▘",
body: "█",
}
var splash = rectFill{
top: "█",
bottom: "█",
left: "█",
right: "█",
topLeft: "█",
topRight: "█",
bottomLeft: "█",
bottomRight: "█",
body: "█",
}
var doubleBorder = rectFill {
top: "═",
bottom: "═",
left: "║",
right: "║",
topLeft: "╔",
topRight: "╗",
bottomLeft: "╚",
bottomRight: "╝",
}
func (r *Rect) Fill() {
r.render(noborder)
}
func (r *Rect) Splash() {
r.render(splash)
}
func (r *Rect) DrawBorder() {
r.render(doubleBorder)
}
func (r *Rect) render (fillage rectFill) {
if fillage.body != "" {
for i := r.x + 1; i < r.x+r.w; i++ {
for j := r.y + 1; j < r.y+r.h; j++ {
r.layer.Put(i, j, fillage.body);
//lii.Put(i, j, "X");
}
}
}
for i := r.x + 1; i < r.x+r.w; i++ {
r.layer.Put(i, r.y, fillage.top);
//lii.Put(i, y-1, "Q");
r.layer.Put(i, r.y+r.h, fillage.bottom);
//lii.Put(i, y+h, "H");
}
for j := r.y + 1; j < r.y+r.h; j++ {
r.layer.Put(r.x, j, fillage.left);
//lii.Put(x-1, j, "U");
r.layer.Put(r.x+r.w, j, fillage.right);
//lii.Put(x+w, j, "M");
}
r.layer.Put(r.x, r.y, fillage.topLeft);
//lii.Put(x-1, y-1, "T");
r.layer.Put(r.x, r.y+r.h, fillage.bottomLeft);
//lii.Put(x-1, y+h, "q");
r.layer.Put(r.x+r.w, r.y, fillage.topRight);
//lii.Put(x+w, y-1, "L");
r.layer.Put(r.x+r.w, r.y+r.h, fillage.bottomRight);
};