1 files changed, 11 insertions, 6 deletions

diff --git a/fw/fe310/eos/eve/eve_text.c b/fw/fe310/eos/eve/eve_text.c
index b52678d..e31195a 100644
--- a/fw/fe310/eos/eve/eve_text.c
+++ b/fw/fe310/eos/eve/eve_text.c
@@ -119,8 +119,8 @@ void eve_text_scroll0(EVEText *box) {
     }
 }
 
-int eve_text_touch(EVEText *box, EVETouch *touch, uint16_t evt, uint8_t tag0) {
-    evt = eve_touch_evt(touch, evt, tag0, box->tag, 1);
+int eve_text_touch(EVEText *box, EVETouch *touch, uint16_t evt) {
+    evt = eve_touch_evt(touch, evt, box->tag, 1);
     if (touch && evt) {
         if ((evt & EVE_TOUCH_ETYPE_TRACK_START) && (box->line_top < 0)) {
             box->line_top = box->line0;
@@ -148,7 +148,7 @@ uint8_t eve_text_draw(EVEText *box, uint8_t tag) {
     box->tag = tag;
     if (tag != EVE_NOTAG) {
         eve_cmd_dl(TAG(tag));
-        eve_touch_set_opt(tag, EVE_TOUCH_OPT_TRACK | EVE_TOUCH_OPT_TRACK_EXT_Y);
+        eve_tag_set_opt(tag, EVE_TOUCH_OPT_TRACK_Y | EVE_TOUCH_OPT_TRACK_EXT_Y);
         tag++;
     }
     eve_cmd(CMD_APPEND, "ww", box->mem_addr + box->w * 2 * box->line_size, box->dl_size * 4);
@@ -161,14 +161,18 @@ void eve_text_putc(EVEText *box, int c) {
     int line_c, line_n;
 
     switch (c) {
-        case '\b':
+        case '\b': {
             eve_text_backspace(box);
             break;
+        }
+
         case '\r':
-        case '\n':
+        case '\n': {
             eve_text_newline(box);
             break;
-        default:
+        }
+
+        default: {
             line_c = box->ch_idx / 2 / box->w;
 
             eve_write16(box->mem_addr + box->ch_idx, 0x0200 | (c & 0xff));
@@ -178,6 +182,7 @@ void eve_text_putc(EVEText *box, int c) {
             line_n = box->ch_idx / 2 / box->w;
             if ((line_c != line_n) && (LINE_IDX_DIFF(line_n, box->line0, box->line_size) == box->h)) scroll1(box);
             break;
+        }
     }
 }