From d9bf3b288ce5f6e84f7e6079948fdf0735b4711f Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Mon, 8 Jun 2020 15:10:47 +0200
Subject: kbd iface fixed

---
 code/fe310/eos/eve/screen/font.c   | 2 +-
 code/fe310/eos/eve/screen/font.h   | 2 +-
 code/fe310/eos/eve/screen/form.c   | 3 +--
 code/fe310/eos/eve/screen/page.c   | 1 -
 code/fe310/eos/eve/screen/screen.c | 2 --
 code/fe310/eos/eve/screen/screen.h | 2 +-
 6 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'code/fe310/eos/eve/screen')

diff --git a/code/fe310/eos/eve/screen/font.c b/code/fe310/eos/eve/screen/font.c
index 6721f00..b5b7b74 100644
--- a/code/fe310/eos/eve/screen/font.c
+++ b/code/fe310/eos/eve/screen/font.c
@@ -5,4 +5,4 @@
 
 void eve_font_init(EVEFont *font, uint8_t font_id) {
     font->id = font_id;
-}
\ No newline at end of file
+}
diff --git a/code/fe310/eos/eve/screen/font.h b/code/fe310/eos/eve/screen/font.h
index 409b109..0572015 100644
--- a/code/fe310/eos/eve/screen/font.h
+++ b/code/fe310/eos/eve/screen/font.h
@@ -6,4 +6,4 @@ typedef struct EVEFont {
     uint8_t h;
 } EVEFont;
 
-void eve_font_init(EVEFont *font, uint8_t font_id);
\ No newline at end of file
+void eve_font_init(EVEFont *font, uint8_t font_id);
diff --git a/code/fe310/eos/eve/screen/form.c b/code/fe310/eos/eve/screen/form.c
index 41105f6..bdf910a 100644
--- a/code/fe310/eos/eve/screen/form.c
+++ b/code/fe310/eos/eve/screen/form.c
@@ -37,7 +37,7 @@ int eve_form_touch(EVEView *v, uint8_t tag0, int touch_idx) {
                     eve_screen_hide_kbd(form->p.window->screen);
                     form->widget_f->putc(form->widget_f, CH_EOF);
                 }
-                eve_kbd_set_handler(kbd, widget->putc);
+                eve_kbd_set_handler(kbd, widget->putc, widget);
                 if (widget && widget->putc) {
                     eve_screen_show_kbd(form->p.window->screen);
                 }
@@ -75,4 +75,3 @@ uint8_t eve_form_draw(EVEView *v, uint8_t tag0) {
 
     return _tagN;
 }
-
diff --git a/code/fe310/eos/eve/screen/page.c b/code/fe310/eos/eve/screen/page.c
index b2ef091..66c7c13 100644
--- a/code/fe310/eos/eve/screen/page.c
+++ b/code/fe310/eos/eve/screen/page.c
@@ -58,4 +58,3 @@ void eve_page_handle_evt(EVEPage *page, EVEWidget *widget, EVETouch *touch, uint
     }
     */
 }
-
diff --git a/code/fe310/eos/eve/screen/screen.c b/code/fe310/eos/eve/screen/screen.c
index 52015be..9827323 100644
--- a/code/fe310/eos/eve/screen/screen.c
+++ b/code/fe310/eos/eve/screen/screen.c
@@ -71,5 +71,3 @@ void eve_screen_win_append(EVEScreen *screen, EVEWindow *window) {
 void eve_screen_handle_touch(EVEScreen *screen, uint8_t tag0, int touch_idx) {
     eve_touch_clear_opt();
 }
-
-
diff --git a/code/fe310/eos/eve/screen/screen.h b/code/fe310/eos/eve/screen/screen.h
index ff634b4..9fa155a 100644
--- a/code/fe310/eos/eve/screen/screen.h
+++ b/code/fe310/eos/eve/screen/screen.h
@@ -12,9 +12,9 @@ typedef struct EVERect {
 typedef struct EVEScreen {
     uint16_t w;
     uint16_t h;
-    EVEKbd *kbd;
     struct EVEWindow *win_head;
     struct EVEWindow *win_tail;
+    EVEKbd *kbd;
     char kbd_active;
 } EVEScreen;
 
-- 
cgit v1.2.3