From f11edefdb58a60045650c8724c225487c1b8a1bc Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Fri, 20 Sep 2019 08:55:47 -0500
Subject: [PATCH] Speak classes of controls for which we don't have a handler,
 and minor naming cleanup.

---
 accessible.gd | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/accessible.gd b/accessible.gd
index ca379e9..aad4f83 100644
--- a/accessible.gd
+++ b/accessible.gd
@@ -334,7 +334,7 @@ func tab_container_input(event):
     if node.current_tab != new_tab:
         node.current_tab = new_tab
 
-func focused():
+func focus():
     print("Focus: %s" % node)
     node.get_tree().root.warp_mouse(node.rect_global_position)
     tts.stop()
@@ -368,16 +368,17 @@ func focused():
     elif node is Tree:
         tree_focus()
     else:
+        tts.speak(node.get_class(), true)
         print("No handler")
     if node.hint_tooltip and not spoke_hint_tooltip:
         tts.speak(node.hint_tooltip, false)
     spoke_hint_tooltip = false
 
-func unfocused():
+func unfocus():
     print("Unfocused")
     position_in_children = 0
 
-func click_focused():
+func click_focus():
     if node.has_focus():
         return
     print("Grabbing focus: %s" % node)
@@ -451,10 +452,10 @@ func _init(tts, node):
     self.node = node
     if is_focusable(node):
         node.set_focus_mode(Control.FOCUS_ALL)
-    node.connect("focus_entered", self, "focused")
-    node.connect("mouse_entered", self, "click_focused")
-    node.connect("focus_exited", self, "unfocused")
-    node.connect("mouse_exited", self, "unfocused")
+    node.connect("focus_entered", self, "focus")
+    node.connect("mouse_entered", self, "click_focus")
+    node.connect("focus_exited", self, "unfocus")
+    node.connect("mouse_exited", self, "unfocus")
     node.connect("gui_input", self, "gui_input")
     if node is CheckBox:
         node.connect("toggled", self, "checkbox_toggled")