From df410e580264763b13753d35f881527b4665b068 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Sun, 10 Jun 2018 19:42:58 +0000
Subject: [PATCH] Initial focus is set, and focus changes are reported.

---
 addons/accessibility/accessibility.gd | 28 ++++++++++++++++-----------
 addons/accessibility/accessible.gd    |  9 ++++-----
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/addons/accessibility/accessibility.gd b/addons/accessibility/accessibility.gd
index 835162c..cc7ea39 100644
--- a/addons/accessibility/accessibility.gd
+++ b/addons/accessibility/accessibility.gd
@@ -10,19 +10,25 @@ func augment_node(node):
 func augment_tree(node):
     augment_node(node)
     for child in node.get_children():
-        augment_node(child)
+        augment_tree(child)
 
 func set_initial_screen_focus(screen):
-    print("Screen ",screen)
-    var focus
-    var root = get_tree().root
-    augment_tree(root)
-    if screen == "3D":
-        focus = root.find_node("ToolButton", true, false)
-    if focus is Control:
-        print("Focus ",focus)
-        focus.grab_click_focus()
-        focus.grab_focus()
+    self.augment_tree(get_tree().root)
+    var focus = find_focusable_control(get_tree().root)
+    print("Focus ",focus, focus.is_in_group("accessible"))
+    if not focus:
+        return
+    focus.grab_click_focus()
+    focus.grab_focus()
+
+func find_focusable_control(node):
+    if node is Control and node.is_visible_in_tree() and (node.focus_mode == Control.FOCUS_CLICK or node.focus_mode == Control.FOCUS_ALL):
+        return node
+    for child in node.get_children():
+        var result = find_focusable_control(child)
+        if result:
+            return result
+    return null
 
 func set_initial_scene_focus(scene):
     print("Set focus in scene")
diff --git a/addons/accessibility/accessible.gd b/addons/accessibility/accessible.gd
index ffb1df6..c6ae8bc 100644
--- a/addons/accessibility/accessible.gd
+++ b/addons/accessibility/accessible.gd
@@ -6,18 +6,17 @@ func focused():
     print("Focus entered.", self.node)
 
 func unfocused():
-    print("Unfocused", self.node)
+    pass
 
-func gui_input():
-    print("GUI input.")
+func gui_input(event):
+    pass
 
 func _init(node):
     if node.is_in_group("accessible"):
         return
     node.add_to_group("accessible")
-    print(node.get_path())
     self.node = node
-    self.node.set_focus_mode(Control.FOCUS_ALL)
+    # self.node.set_focus_mode(Control.FOCUS_ALL)
     self.node.connect("focus_entered", self, "focused")
     self.node.connect("mouse_entered", self, "focused")
     self.node.connect("focus_exited", self, "unfocused")