gui: update wordlist active/selected keyboard buttons atomically

Author: Jamie C. Driver

main/gui.c

@@ -515,6 +515,36 @@ static void select_action(gui_activity_t* activity)
     }
 }
 
+// Mark a collection of nodes as active or inactive, select one, and redraw the entire activity.
+void gui_activity_set_active_selection(gui_activity_t* activity, gui_view_node_t** nodes, const size_t num_nodes,
+    const bool* active, gui_view_node_t* selected)
+{
+    JADE_ASSERT(activity);
+    JADE_ASSERT(nodes);
+    JADE_ASSERT(num_nodes);
+    JADE_ASSERT(active);
+    JADE_ASSERT(selected);
+
+    bool set_selected = false;
+    JADE_SEMAPHORE_TAKE(gui_mutex);
+    for (size_t i = 0; i < num_nodes; ++i) {
+        JADE_ASSERT(nodes[i]->activity == activity);
+        set_tree_active(nodes[i], active[i]);
+        if (nodes[i] == selected) {
+            JADE_ASSERT(active[i]); // can only select active node
+            gui_select_node(nodes[i]);
+            set_selected = true;
+        }
+    }
+    JADE_SEMAPHORE_GIVE(gui_mutex);
+
+    // 'selected' should have been seen in 'nodes'
+    JADE_ASSERT(set_selected);
+
+    // May as well repaint the whole activity
+    gui_repaint(activity->root_node);
+}
+
 // push a selectable element to the `selectables` list of `activity`
 static void push_selectable(gui_activity_t* activity, gui_view_node_t* node, uint16_t x, uint16_t y)
 {

main/gui.h

@@ -455,7 +455,8 @@ bool gui_activity_wait_event(gui_activity_t* activity, const char* event_base, u
 
 void gui_set_activity_initial_selection(gui_view_node_t* node);
 void gui_set_active(gui_view_node_t* node, bool value);
-void gui_select_node(gui_view_node_t* node);
+void gui_activity_set_active_selection(
+    gui_activity_t* activity, gui_view_node_t** nodes, size_t num_nodes, const bool* active, gui_view_node_t* selected);
 
 void gui_set_activity_title(gui_activity_t* activity, const char* title);
 

main/process/mnemonic.c

@@ -489,16 +489,21 @@ static void enable_relevant_chars(const bool is_mnemonic, const char* word, cons
     JADE_ASSERT(num_enabled > 0);
 
     // Select a random active letter as the selected one
-    uint8_t selected = get_uniform_random_byte(num_enabled);
+    uint8_t iselected = get_uniform_random_byte(num_enabled);
+    gui_view_node_t* selected = NULL;
     for (size_t i = 0; i < btns_len; ++i) {
         JADE_ASSERT(btns[i]->activity == act);
-        gui_set_active(btns[i], enabled[i]);
 
-        // If we haven't set a selected item yet, set it now
-        if (enabled[i] && !selected--) {
-            gui_select_node(btns[i]);
+        // Set item to select
+        if (enabled[i] && !iselected--) {
+            JADE_ASSERT(!selected);
+            selected = btns[i];
         }
     }
+    JADE_ASSERT(selected);
+
+    // Update the ui
+    gui_activity_set_active_selection(act, btns, btns_len, enabled, selected);
 }
 
 // NOTE: only the English wordlist is supported.