username/barnard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uiterm: make View interface methods private

Browse Source
This commit is contained in:
Tim Cooper
2014-12-06 21:48:11 -04:00
parent 04ea502802
commit dc4b3a3662
6 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
uiterm/label.go
View File

@@ -14,17 +14,17 @@ type Label struct {
x0, y0, x1, y1 int x0, y0, x1, y1 int
} }
func (l *Label) SetActive(ui *Ui, active bool) { func (l *Label) setActive(ui *Ui, active bool) {
} }
func (l *Label) SetBounds(ui *Ui, x0, y0, x1, y1 int) { func (l *Label) setBounds(ui *Ui, x0, y0, x1, y1 int) {
l.x0 = x0 l.x0 = x0
l.y0 = y0 l.y0 = y0
l.x1 = x1 l.x1 = x1
l.y1 = y1 l.y1 = y1
} }
func (l *Label) Draw(ui *Ui) { func (l *Label) draw(ui *Ui) {
reader := strings.NewReader(l.Text) reader := strings.NewReader(l.Text)
for y := l.y0; y < l.y1; y++ { for y := l.y0; y < l.y1; y++ {
for x := l.x0; x < l.x1; x++ { for x := l.x0; x < l.x1; x++ {
@@ -39,8 +39,8 @@ func (l *Label) Draw(ui *Ui) {
} }
} }
func (l *Label) KeyEvent(ui *Ui, mod Modifier, key Key) { func (l *Label) keyEvent(ui *Ui, mod Modifier, key Key) {
} }
func (l *Label) CharacterEvent(ui *Ui, chr rune) { func (l *Label) characterEvent(ui *Ui, chr rune) {
} }

14
uiterm/textbox.go
View File

@@ -20,18 +20,18 @@ type Textbox struct {
x0, y0, x1, y1 int x0, y0, x1, y1 int
} }
func (t *Textbox) SetBounds(ui *Ui, x0, y0, x1, y1 int) { func (t *Textbox) setBounds(ui *Ui, x0, y0, x1, y1 int) {
t.x0 = x0 t.x0 = x0
t.y0 = y0 t.y0 = y0
t.x1 = x1 t.x1 = x1
t.y1 = y1 t.y1 = y1
} }
func (t *Textbox) SetActive(ui *Ui, active bool) { func (t *Textbox) setActive(ui *Ui, active bool) {
t.active = active t.active = active
} }
func (t *Textbox) Draw(ui *Ui) { func (t *Textbox) draw(ui *Ui) {
var setCursor = false var setCursor = false
reader := strings.NewReader(t.Text) reader := strings.NewReader(t.Text)
for y := t.y0; y < t.y1; y++ { for y := t.y0; y < t.y1; y++ {
@@ -51,7 +51,7 @@ func (t *Textbox) Draw(ui *Ui) {
} }
} }
func (t *Textbox) KeyEvent(ui *Ui, mod Modifier, key Key) { func (t *Textbox) keyEvent(ui *Ui, mod Modifier, key Key) {
redraw := false redraw := false
switch key { switch key {
case KeyCtrlC: case KeyCtrlC:
@@ -76,13 +76,13 @@ func (t *Textbox) KeyEvent(ui *Ui, mod Modifier, key Key) {
} }
} }
if redraw { if redraw {
t.Draw(ui) t.draw(ui)
termbox.Flush() termbox.Flush()
} }
} }
func (t *Textbox) CharacterEvent(ui *Ui, chr rune) { func (t *Textbox) characterEvent(ui *Ui, chr rune) {
t.Text = t.Text + string(chr) t.Text = t.Text + string(chr)
t.Draw(ui) t.draw(ui)
termbox.Flush() termbox.Flush()
} }

10
uiterm/textview.go
View File

@@ -16,10 +16,10 @@ type Textview struct {
x0, y0, x1, y1 int x0, y0, x1, y1 int
} }
func (t *Textview) SetActive(ui *Ui, active bool) { func (t *Textview) setActive(ui *Ui, active bool) {
} }
func (t *Textview) SetBounds(ui *Ui, x0, y0, x1, y1 int) { func (t *Textview) setBounds(ui *Ui, x0, y0, x1, y1 int) {
t.x0 = x0 t.x0 = x0
t.y0 = y0 t.y0 = y0
t.x1 = x1 t.x1 = x1
@@ -96,7 +96,7 @@ func (t *Textview) Clear() {
t.parsedLines = nil t.parsedLines = nil
} }
func (t *Textview) Draw(ui *Ui) { func (t *Textview) draw(ui *Ui) {
var reader *strings.Reader var reader *strings.Reader
line := len(t.parsedLines) - 1 - t.CurrentLine line := len(t.parsedLines) - 1 - t.CurrentLine
if line < 0 { if line < 0 {
@@ -134,8 +134,8 @@ func (t *Textview) Draw(ui *Ui) {
} }
} }
func (t *Textview) KeyEvent(ui *Ui, mod Modifier, key Key) { func (t *Textview) keyEvent(ui *Ui, mod Modifier, key Key) {
} }
func (t *Textview) CharacterEvent(ui *Ui, chr rune) { func (t *Textview) characterEvent(ui *Ui, chr rune) {
} }

10
uiterm/tree.go
View File

@@ -42,7 +42,7 @@ func bounded(i, lower, upper int) int {
return i return i
} }
func (t *Tree) SetBounds(ui *Ui, x0, y0, x1, y1 int) { func (t *Tree) setBounds(ui *Ui, x0, y0, x1, y1 int) {
t.x0 = x0 t.x0 = x0
t.y0 = y0 t.y0 = y0
t.x1 = x1 t.x1 = x1
@@ -85,7 +85,7 @@ func (t *Tree) rebuild_rec(parent TreeItem, level int) []renderedTreeItem {
return lines return lines
} }
func (t *Tree) Draw(ui *Ui) { func (t *Tree) draw(ui *Ui) {
if t.lines == nil { if t.lines == nil {
t.Rebuild() t.Rebuild()
} }
@@ -118,11 +118,11 @@ func (t *Tree) Draw(ui *Ui) {
} }
} }
func (t *Tree) SetActive(ui *Ui, active bool) { func (t *Tree) setActive(ui *Ui, active bool) {
t.active = active t.active = active
} }
func (t *Tree) KeyEvent(ui *Ui, mod Modifier, key Key) { func (t *Tree) keyEvent(ui *Ui, mod Modifier, key Key) {
switch key { switch key {
case KeyArrowUp: case KeyArrowUp:
t.activeLine = bounded(t.activeLine-1, 0, len(t.lines)-1) t.activeLine = bounded(t.activeLine-1, 0, len(t.lines)-1)
@@ -136,5 +136,5 @@ func (t *Tree) KeyEvent(ui *Ui, mod Modifier, key Key) {
ui.Refresh() ui.Refresh()
} }
func (t *Tree) CharacterEvent(ui *Ui, ch rune) { func (t *Tree) characterEvent(ui *Ui, ch rune) {
} }

12
uiterm/ui.go
View File

@@ -52,7 +52,7 @@ func (ui *Ui) Refresh() {
termbox.Clear(termbox.Attribute(ui.fg), termbox.Attribute(ui.bg)) termbox.Clear(termbox.Attribute(ui.fg), termbox.Attribute(ui.bg))
termbox.HideCursor() termbox.HideCursor()
for _, element := range ui.elements { for _, element := range ui.elements {
element.View.Draw(ui) element.View.draw(ui)
} }
termbox.Flush() termbox.Flush()
} }
@@ -65,11 +65,11 @@ func (ui *Ui) Active() View {
func (ui *Ui) SetActive(name string) { func (ui *Ui) SetActive(name string) {
element, _ := ui.elements[name] element, _ := ui.elements[name]
if ui.activeElement != nil { if ui.activeElement != nil {
ui.activeElement.View.SetActive(ui, false) ui.activeElement.View.setActive(ui, false)
} }
ui.activeElement = element ui.activeElement = element
if element != nil { if element != nil {
element.View.SetActive(ui, true) element.View.setActive(ui, true)
} }
ui.Refresh() ui.Refresh()
} }
@@ -123,7 +123,7 @@ func (ui *Ui) Run() error {
func (ui *Ui) onCharacterEvent(ch rune) { func (ui *Ui) onCharacterEvent(ch rune) {
if ui.activeElement != nil { if ui.activeElement != nil {
ui.activeElement.View.CharacterEvent(ui, ch) ui.activeElement.View.characterEvent(ui, ch)
} }
} }
@@ -134,7 +134,7 @@ func (ui *Ui) onKeyEvent(mod Modifier, key Key) {
} }
} }
if ui.activeElement != nil { if ui.activeElement != nil {
ui.activeElement.View.KeyEvent(ui, mod, key) ui.activeElement.View.keyEvent(ui, mod, key)
} }
} }
@@ -154,7 +154,7 @@ func (ui *Ui) SetView(name string, x0, y0, x1, y1 int, view View) {
View: view, View: view,
} }
} }
view.SetBounds(ui, x0, y0, x1, y1) view.setBounds(ui, x0, y0, x1, y1)
} }
func (ui *Ui) View(name string) View { func (ui *Ui) View(name string) View {

10
uiterm/view.go
View File

@@ -1,9 +1,9 @@
package uiterm package uiterm
type View interface { type View interface {
SetBounds(ui *Ui, x0, y0, x1, y1 int) setActive(ui *Ui, active bool)
Draw(ui *Ui) setBounds(ui *Ui, x0, y0, x1, y1 int)
SetActive(ui *Ui, active bool) draw(ui *Ui)
KeyEvent(ui *Ui, mod Modifier, key Key) keyEvent(ui *Ui, mod Modifier, key Key)
CharacterEvent(ui *Ui, ch rune) characterEvent(ui *Ui, ch rune)
} }