8 files changed, 21 insertions, 25 deletions

diff --git a/ui/form/Button.js b/ui/form/Button.js
index 9a3d2f7..86347a0 100644
--- a/ui/form/Button.js
+++ b/ui/form/Button.js
@@ -1,5 +1,5 @@
-const ansi = require('../../ansi')
-const telc = require('../../telchars')
+const ansi = require('../../util/ansi')
+const telc = require('../../util/telchars')
 
 const FocusElement = require('./FocusElement')
 
@@ -29,7 +29,7 @@ module.exports = class ButtonInput extends FocusElement {
   }
 
   drawTo(writable) {
-    if (this.isSelected) {
+    if (this.isFocused) {
       writable.write(ansi.invert())
     }
 
diff --git a/ui/form/CancelDialog.js b/ui/form/CancelDialog.js
index ba9faf8..c5eb7d3 100644
--- a/ui/form/CancelDialog.js
+++ b/ui/form/CancelDialog.js
@@ -1,4 +1,4 @@
-const telc = require('../../telchars')
+const telc = require('../../util/telchars')
 
 const FocusElement = require('./FocusElement')
 
@@ -47,7 +47,7 @@ module.exports = class ConfirmDialog extends FocusElement {
     this.cancelBtn.y = this.pane.contentH - 2
   }
 
-  focus() {
+  focused() {
     this.root.select(this.cancelBtn)
   }
 
diff --git a/ui/form/ConfirmDialog.js b/ui/form/ConfirmDialog.js
index 614dede..3614cf9 100644
--- a/ui/form/ConfirmDialog.js
+++ b/ui/form/ConfirmDialog.js
@@ -1,4 +1,4 @@
-const telc = require('../../telchars')
+const telc = require('../../util/telchars')
 
 const FocusElement = require('./FocusElement')
 
@@ -59,7 +59,7 @@ module.exports = class ConfirmDialog extends FocusElement {
     this.cancelBtn.y = this.form.contentH - 2
   }
 
-  focus() {
+  focused() {
     this.root.select(this.form)
   }
 
diff --git a/ui/form/FocusBox.js b/ui/form/FocusBox.js
index c259f23..51e961b 100644
--- a/ui/form/FocusBox.js
+++ b/ui/form/FocusBox.js
@@ -1,4 +1,4 @@
-const ansi = require('../../ansi')
+const ansi = require('../../util/ansi')
 
 const FocusElement = require('./FocusElement')
 
@@ -19,13 +19,13 @@ module.exports = class FocusBox extends FocusElement {
   }
 
   drawTo(writable) {
-    if (this.isSelected) {
+    if (this.isFocused) {
       writable.write(ansi.invert())
     }
   }
 
   didRenderTo(writable) {
-    if (this.isSelected) {
+    if (this.isFocused) {
       writable.write(ansi.resetAttributes())
     }
   }
diff --git a/ui/form/FocusElement.js b/ui/form/FocusElement.js
index 25a0693..5967e26 100644
--- a/ui/form/FocusElement.js
+++ b/ui/form/FocusElement.js
@@ -9,19 +9,19 @@ module.exports = class FocusElement extends DisplayElement {
     this.cursorX = 0
     this.cursorY = 0
 
-    this.isSelected = false
+    this.isFocused = false
   }
 
-  focus(socket) {
-    // Do something with socket. Should be overridden in subclasses.
+  focused() {
+    // Should be overridden in subclasses.
 
-    this.isSelected = true
+    this.isFocused = true
   }
 
-  unfocus() {
+  unfocused() {
     // Should be overridden in subclasses.
 
-    this.isSelected = false
+    this.isFocused = false
   }
 
   keyPressed(keyBuf) {
diff --git a/ui/form/Form.js b/ui/form/Form.js
index 49fa075..9274da4 100644
--- a/ui/form/Form.js
+++ b/ui/form/Form.js
@@ -1,4 +1,4 @@
-const telc = require('../../telchars')
+const telc = require('../../util/telchars')
 
 const FocusElement = require('./FocusElement')
 
@@ -45,7 +45,7 @@ module.exports = class Form extends FocusElement {
     }
   }
   
-  focus() {
+  focused() {
     this.root.select(this.inputs[this.curIndex])
   }
 }
diff --git a/ui/form/HorizontalForm.js b/ui/form/HorizontalForm.js
deleted file mode 100644
index 141bb17..0000000
--- a/ui/form/HorizontalForm.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const Form = require('./DisplayElement')
-
-module.exports = class HorizontalBox extends Box {
-}
diff --git a/ui/form/TextInput.js b/ui/form/TextInput.js
index d09480f..fc59cbb 100644
--- a/ui/form/TextInput.js
+++ b/ui/form/TextInput.js
@@ -1,6 +1,6 @@
-const ansi = require('../../ansi')
-const unic = require('../../unichars')
-const telc = require('../../telchars')
+const ansi = require('../../util/ansi')
+const unic = require('../../util/unichars')
+const telc = require('../../util/telchars')
 
 const FocusElement = require('./FocusElement')