From 4c1cebe0f7b2a6b94f041c91021e628cfbdac693 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphaelcoeffic@users.noreply.github.com>
Date: Mon, 17 Oct 2022 14:11:56 +0200
Subject: [PATCH] fix(lua): send EVT_VIRTUAL_EXIT only on short EXIT press
 (#2573)

Fixes #2436
---
 radio/src/gui/colorlcd/LvglWrapper.cpp | 19 +++++++++++--------
 radio/src/lua/lua_widget.cpp           |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/colorlcd/LvglWrapper.cpp b/radio/src/gui/colorlcd/LvglWrapper.cpp
index c43be261f..4672d6b11 100644
--- a/radio/src/gui/colorlcd/LvglWrapper.cpp
+++ b/radio/src/gui/colorlcd/LvglWrapper.cpp
@@ -76,15 +76,12 @@ static bool evt_to_indev_data(event_t evt, lv_indev_data_t *data)
     break;
 
   case KEY_EXIT:
-    if (evt != EVT_KEY_LONG(KEY_EXIT)) {
+    if (evt == EVT_KEY_BREAK(KEY_EXIT)) {
       data->key = LV_KEY_ESC;
-    } else {
-      // prevent subsequent RELEASE event
-      lv_indev_wait_release(lv_indev_get_act());
       data->state = LV_INDEV_STATE_PRESSED;
-      return false;
+      return true;
     }
-    break;    
+    return false;
 
   default:
     // abort LVGL event
@@ -107,9 +104,9 @@ static void dispatch_kb_event(Window* w, event_t evt)
   event_t key = EVT_KEY_MASK(evt);
   if (evt == EVT_KEY_BREAK(KEY_ENTER)) {
     w->onClicked();
-  } else if (evt == EVT_KEY_FIRST(KEY_EXIT)) {
+  } else if (evt == EVT_KEY_BREAK(KEY_EXIT)) {
     w->onCancel();
-  } else if (key != KEY_ENTER /*&& key != KEY_EXIT*/) {
+  } else if (key != KEY_ENTER) {
     w->onEvent(evt);
   } else if (evt == EVT_KEY_LONG(KEY_ENTER)) {
     killEvents(KEY_ENTER);
@@ -157,6 +154,12 @@ static void keyboardDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
 
   // no event: send a copy of the last one
   copy_kb_data_backup(data);
+
+  // simulate EXIT release: necessary to map
+  // EVT_KEY_BREAK(KEY_EXIT) to LV_EVENT_CANCEL
+  if (data->key == KEY_EXIT && data->state == LV_INDEV_STATE_PRESSED) {
+    data->state = LV_INDEV_STATE_RELEASED;
+  }
 }
 
 static void copy_ts_to_indev_data(const TouchState &st, lv_indev_data_t *data)
diff --git a/radio/src/lua/lua_widget.cpp b/radio/src/lua/lua_widget.cpp
index a49d89631..f8d923510 100644
--- a/radio/src/lua/lua_widget.cpp
+++ b/radio/src/lua/lua_widget.cpp
@@ -145,6 +145,7 @@ void LuaEventHandler::onCancel()
 
 void LuaEventHandler::onEvent(event_t event)
 {
+  if (event == EVT_KEY_LONG(KEY_EXIT)) killEvents(KEY_EXIT);
   luaPushEvent(event);
 }