Merge branch 'maint/reduce-events'

Author: NickeZ

src/CMakeLists.txt

@@ -74,15 +74,13 @@ set(DBB-FIRMWARE-UI-SOURCES
     ${CMAKE_SOURCE_DIR}/src/ui/components/trinary_input_string.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/waiting.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/screensaver.c
-    ${CMAKE_SOURCE_DIR}/src/ui/components/entry_screen.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/knight_rider.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/right_arrow.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/left_arrow.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/icon_button.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/confirm_gesture.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/label.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/confirm.c
-    ${CMAKE_SOURCE_DIR}/src/ui/components/confirm_button.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/keyboard_switch.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/orientation_arrows.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/info_centered.c

src/rust/bitbox02-sys/build.rs

@@ -200,12 +200,10 @@ const BITBOX02_SOURCES: &[&str] = &[
     "src/u2f/u2f_app.c",
     "src/u2f/u2f_packet.c",
     "src/ui/components/button.c",
-    "src/ui/components/confirm_button.c",
     "src/ui/components/confirm_gesture.c",
     "src/ui/components/confirm_transaction.c",
     "src/ui/components/confirm.c",
     "src/ui/components/empty.c",
-    "src/ui/components/entry_screen.c",
     "src/ui/components/icon_button.c",
     "src/ui/components/image.c",
     "src/ui/components/info_centered.c",

src/ui/components/confirm.c

@@ -31,31 +31,19 @@ typedef struct {
     void* user_data;
 } data_t;
 
-static void _dispatch_confirm(component_t* self)
+static void _on_confirm(void* user_data)
 {
+    component_t* self = (component_t*)user_data;
     data_t* data = (data_t*)self->data;
     if (data->callback) {
         data->callback(true, data->user_data);
         data->callback = NULL;
     }
 }
 
-static void _on_event(const event_t* event, component_t* component)
+static void _on_cancel(void* user_data)
 {
-    if (event->id == EVENT_CONFIRM) {
-        _dispatch_confirm(component);
-    }
-}
-
-static void _on_confirm(component_t* component)
-{
-    component_t* self = component->parent;
-    _dispatch_confirm(self);
-}
-
-static void _on_cancel(component_t* component)
-{
-    component_t* self = component->parent;
+    component_t* self = (component_t*)user_data;
     data_t* data = (data_t*)self->data;
     if (data->callback) {
         data->callback(false, data->user_data);
@@ -71,7 +59,7 @@ static void _on_cancel(component_t* component)
 static const component_functions_t _component_functions = {
     .cleanup = ui_util_component_cleanup,
     .render = ui_util_component_render_subcomponents,
-    .on_event = _on_event,
+    .on_event = NULL,
 };
 
 /********************************** Create Instance **********************************/
@@ -154,17 +142,18 @@ component_t* confirm_create(
     // Create buttons
     if (!params->accept_only) {
         ui_util_add_sub_component(
-            confirm, icon_button_create(slider_position, ICON_BUTTON_CROSS, _on_cancel));
+            confirm, icon_button_create(slider_position, ICON_BUTTON_CROSS, _on_cancel, confirm));
     }
     if (params->longtouch) {
-        ui_util_add_sub_component(confirm, confirm_gesture_create());
+        ui_util_add_sub_component(confirm, confirm_gesture_create(_on_confirm, confirm));
     } else {
         ui_util_add_sub_component(
             confirm,
             icon_button_create(
                 slider_position,
                 params->accept_is_nextarrow ? ICON_BUTTON_NEXT : ICON_BUTTON_CHECK,
-                _on_confirm));
+                _on_confirm,
+                confirm));
     }
 
     return confirm;

src/ui/components/confirm_button.c

@@ -36,6 +36,8 @@ typedef struct {
     bool confirmed; // Confirm event occurred
     uint16_t active_count; // Start at an offset to allow movement on first touch
     uint16_t bottom_arrow_slidein; // from zero to arrow height * SCALE
+    void (*callback)(void* user_data);
+    void* user_data;
 } confirm_data_t;
 
 bool confirm_gesture_is_active(component_t* component)
@@ -84,9 +86,9 @@ static void _render(component_t* component)
 
     // The user confirms when the top and bottom arrows touch
     if (y0 + arrow_height > y1 && !data->confirmed) {
-        event_t event;
-        event.id = EVENT_CONFIRM;
-        emit_event(&event);
+        if (data->callback) {
+            data->callback(data->user_data);
+        }
         data->confirmed = true;
     }
 }
@@ -155,7 +157,7 @@ static component_functions_t _component_functions = {
 /**
  * Creates a confirm_gesture component on the top slider.
  */
-component_t* confirm_gesture_create(void)
+component_t* confirm_gesture_create(void (*callback)(void*), void* user_data)
 {
     confirm_data_t* data = malloc(sizeof(confirm_data_t));
     if (!data) {
@@ -167,6 +169,8 @@ component_t* confirm_gesture_create(void)
     data->confirmed = false;
     data->active_count = SCALE - 1;
     data->bottom_arrow_slidein = 0;
+    data->callback = callback;
+    data->user_data = user_data;
 
     component_t* confirm_gesture = malloc(sizeof(component_t));
     if (!confirm_gesture) {

src/ui/components/confirm_button.h

@@ -24,7 +24,7 @@
  * Creates a confirm_gesture component on the top slider.
  * @param[in] parent The parent component.
  */
-component_t* confirm_gesture_create(void);
+component_t* confirm_gesture_create(void (*callback)(void* user_data), void* user_data);
 
 bool confirm_gesture_is_active(component_t* component);
 

src/ui/components/confirm_gesture.c

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "confirm_transaction.h"
-#include "confirm_button.h"
+#include "confirm_gesture.h"
 #include "icon_button.h"
 #include "label.h"
 #include "ui_images.h"
@@ -50,23 +50,22 @@ static void _render(component_t* component)
     }
 }
 
-static void _on_event(const event_t* event, component_t* component)
+static void _cancel_cb(void* user_data)
 {
-    if (event->id == EVENT_CONFIRM) {
-        data_t* data = (data_t*)component->data;
-        if (data->callback) {
-            data->callback(true, data->user_data);
-            data->callback = NULL;
-        }
+    component_t* self = (component_t*)user_data;
+    data_t* data = (data_t*)self->data;
+    if (data->callback != NULL) {
+        data->callback(false, data->user_data);
+        data->callback = NULL;
     }
 }
 
-static void _cancel(component_t* cancel_button)
+static void _confirm_cb(void* user_data)
 {
-    component_t* component = cancel_button->parent;
-    data_t* data = (data_t*)component->data;
-    if (data->callback != NULL) {
-        data->callback(false, data->user_data);
+    component_t* self = (component_t*)user_data;
+    data_t* data = (data_t*)self->data;
+    if (data->callback) {
+        data->callback(true, data->user_data);
         data->callback = NULL;
     }
 }
@@ -79,7 +78,7 @@ static void _cancel(component_t* cancel_button)
 static const component_functions_t _component_functions = {
     .cleanup = ui_util_component_cleanup,
     .render = _render,
-    .on_event = _on_event,
+    .on_event = NULL,
 };
 
 /********************************** Create Instance **********************************/
@@ -118,9 +117,15 @@ static component_t* _confirm_transaction_create(
     confirm->dimension.width = SCREEN_WIDTH;
     confirm->dimension.height = SCREEN_HEIGHT;
 
-    ui_util_add_sub_component(confirm, icon_button_create(top_slider, ICON_BUTTON_CROSS, _cancel));
+    ui_util_add_sub_component(
+        confirm, icon_button_create(top_slider, ICON_BUTTON_CROSS, _cancel_cb, confirm));
 
-    ui_util_add_sub_component(confirm, confirm_button_create(longtouch, ICON_BUTTON_NEXT));
+    if (longtouch) {
+        ui_util_add_sub_component(confirm, confirm_gesture_create(_confirm_cb, confirm));
+    } else {
+        ui_util_add_sub_component(
+            confirm, icon_button_create(top_slider, ICON_BUTTON_NEXT, _confirm_cb, confirm));
+    }
 
     if (data->has_address) {
         ui_util_add_sub_component(