From 8e27c1c6c8251cbb3b7dba50a4c52e8e3add3ffa Mon Sep 17 00:00:00 2001
From: Jordan Orelli <jordanorelli@gmail.com>
Date: Sun, 25 Oct 2020 03:17:15 +0000
Subject: [PATCH] refactoring

---
 point.go   | 12 ++++++++++-
 ui.go      |  5 ++++-
 ui_mode.go | 59 ++++++++++++++++++++++++++++--------------------------
 3 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/point.go b/point.go
index 0d82c46..bcb22c1 100644
--- a/point.go
+++ b/point.go
@@ -1,3 +1,13 @@
 package main
 
-type point struct { x, y int }
+type point struct{ x, y int }
+
+func clamp(n, min, max int) int {
+	if n < min {
+		return min
+	}
+	if n > max {
+		return max
+	}
+	return n
+}
diff --git a/ui.go b/ui.go
index 108453d..845c8b8 100644
--- a/ui.go
+++ b/ui.go
@@ -36,7 +36,10 @@ func (ui *ui) run() {
 		screen.Fini()
 	}()
 
-	ui.mode = &boxWalker{}
+	ui.mode = &boxWalker{
+		width:  10,
+		height: 6,
+	}
 	ui.menu()
 	ui.Debug("clearing screen")
 	screen.Clear()
diff --git a/ui_mode.go b/ui_mode.go
index b0ecad8..8425e6f 100644
--- a/ui_mode.go
+++ b/ui_mode.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/gdamore/tcell/v2"
 )
 
@@ -24,13 +22,13 @@ func (m *boxWalker) HandleEvent(e tcell.Event) bool {
 		if key == tcell.KeyRune {
 			switch v.Rune() {
 			case 'w':
-				m.position.y--
+				m.move(0, -1)
 			case 'a':
-				m.position.x--
+				m.move(-1, 0)
 			case 's':
-				m.position.y++
+				m.move(0, 1)
 			case 'd':
-				m.position.x++
+				m.move(1, 0)
 			}
 		}
 	default:
@@ -39,30 +37,35 @@ func (m *boxWalker) HandleEvent(e tcell.Event) bool {
 	return true
 }
 
+func (m *boxWalker) move(dx, dy int) {
+	m.position.x = clamp(m.position.x+dx, 0, m.width-1)
+	m.position.y = clamp(m.position.y+dy, 0, m.height-1)
+}
+
 func (m *boxWalker) draw(ui *ui) {
-	if m.position.x < 2 {
-		m.position.x = 2
-	}
-	if m.position.x > 11 {
-		m.position.x = 11
+	offset := point{1, 1}
+
+	// fill in background dots first
+	for x := 0; x < m.width; x++ {
+		for y := 0; y < m.height; y++ {
+			ui.screen.SetContent(x+offset.x, y+offset.y, '·', nil, tcell.StyleDefault)
+		}
 	}
-	if m.position.y < 2 {
-		m.position.y = 2
+
+	// frame it
+	ui.screen.SetContent(offset.x-1, offset.y-1, '┌', nil, tcell.StyleDefault)
+	ui.screen.SetContent(offset.x+m.width, offset.y-1, '┐', nil, tcell.StyleDefault)
+	ui.screen.SetContent(offset.x-1, offset.y+m.height, '└', nil, tcell.StyleDefault)
+	ui.screen.SetContent(offset.x+m.width, offset.y+m.height, '┘', nil, tcell.StyleDefault)
+	for x := 0; x < m.width; x++ {
+		ui.screen.SetContent(x+offset.x, offset.y-1, '─', nil, tcell.StyleDefault)
+		ui.screen.SetContent(x+offset.x, offset.y+m.height, '─', nil, tcell.StyleDefault)
 	}
-	if m.position.y > 10 {
-		m.position.y = 10
+	for y := 0; y < m.height; y++ {
+		ui.screen.SetContent(offset.x-1, y+offset.y, '│', nil, tcell.StyleDefault)
+		ui.screen.SetContent(offset.x+m.width, y+offset.y, '│', nil, tcell.StyleDefault)
 	}
-	ui.writeString(1, 1, `┌──────────┐`, tcell.StyleDefault)
-	ui.writeString(1, 2, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 3, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 4, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 5, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 6, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 7, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 8, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 9, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 10, `│··········│`, tcell.StyleDefault)
-	ui.writeString(1, 11, `└──────────┘`, tcell.StyleDefault)
-	ui.screen.SetContent(m.position.x, m.position.y, '@', nil, tcell.StyleDefault)
-	ui.writeString(0, 12, fmt.Sprintf(" (%02d, %02d)", m.position.x, m.position.y), tcell.StyleDefault)
+
+	// add all characters
+	ui.screen.SetContent(m.position.x+offset.x, m.position.y+offset.y, '@', nil, tcell.StyleDefault)
 }