1 files changed, 47 insertions, 23 deletions

diff --git a/code/fe310/eos/eve/screen/page.c b/code/fe310/eos/eve/screen/page.c
index b1b3985..7631c95 100644
--- a/code/fe310/eos/eve/screen/page.c
+++ b/code/fe310/eos/eve/screen/page.c
@@ -12,54 +12,78 @@
 #include "widget/label.h"
 #include "widget/widget.h"
 
-void eve_page_init(EVEPage *page, eve_view_touch_t touch, eve_view_draw_t draw, eve_page_open_t open, eve_page_close_t close, eve_page_evt_handler_t handle_evt, eve_page_g_updater_t update_g, EVEWindow *window) {
+#define CH_EOF              0x1a
+
+void eve_page_init(EVEPage *page, EVEWindow *window, eve_view_touch_t touch, eve_view_draw_t draw, eve_page_open_t open, eve_page_close_t close, eve_page_evt_handler_t handle_evt, eve_page_g_updater_t update_g) {
     memset(page, 0, sizeof(EVEPage));
     page->v.touch = touch;
     page->v.draw = draw;
+    page->v.window = window;
     page->open = open;
     page->close = close;
     page->handle_evt = handle_evt;
     page->update_g = update_g;
     page->widget_f = NULL;
-    page->window = window;
+    window->view = (EVEView *)page;
 }
 
 int16_t eve_page_x(EVEPage *page, int16_t x) {
-    return x + page->win_x - page->window->g.x;
+    return x + page->win_x - page->v.window->g.x;
 }
 
 int16_t eve_page_y(EVEPage *page, int16_t y) {
-    return y + page->win_y - page->window->g.y;
+    return y + page->win_y - page->v.window->g.y;
 }
 
 int16_t eve_page_scr_x(EVEPage *page, int16_t x) {
-    return x - page->win_x + page->window->g.x;
+    return x - page->win_x + page->v.window->g.x;
 }
 
 int16_t eve_page_scr_y(EVEPage *page, int16_t y) {
-    return y - page->win_y + page->window->g.y;
+    return y - page->win_y + page->v.window->g.y;
 }
 
 void eve_page_set_focus(EVEPage *page, EVEWidget *widget, EVERect *f) {
-    EVERect g;
+    if (page->widget_f != widget) {
+        EVEKbd *kbd = eve_screen_get_kbd(page->v.window->screen);
 
-    eve_window_visible_g(page->window, &g);
-    g.x -= page->window->g.x;
-    g.y -= page->window->g.y;
+        if (kbd) {
+            EVEWidget *widget_f = page->widget_f;
 
-    if (f->x < page->win_x + g.x) {
-        page->win_x = f->x - g.x;
-    }
-    if (f->y < page->win_y + g.y) {
-        page->win_y = f->y - g.y;
-    }
-    if ((f->x + f->w) > (page->win_x + g.x + g.w)) {
-        page->win_x = (f->x + f->w) - (g.x + g.w);
+            if (widget_f && widget_f->putc) {
+                eve_screen_hide_kbd(page->v.window->screen);
+                widget_f->putc(page, CH_EOF);
+            }
+            if (widget && widget->putc) {
+                eve_kbd_set_handler(kbd, widget->putc, page);
+                eve_screen_show_kbd(page->v.window->screen);
+            } else {
+                eve_kbd_set_handler(kbd, NULL, NULL);
+            }
+        }
+        page->widget_f = widget;
     }
-    if ((f->y + f->h) > (page->win_y + g.y + g.h)) {
-        page->win_y = (f->y + f->h) - (g.y + g.h);
+
+    if (f) {
+        EVERect g;
+
+        eve_window_visible_g(page->v.window, &g);
+        g.x -= page->v.window->g.x;
+        g.y -= page->v.window->g.y;
+
+        if (f->x < page->win_x + g.x) {
+            page->win_x = f->x - g.x;
+        }
+        if (f->y < page->win_y + g.y) {
+            page->win_y = f->y - g.y;
+        }
+        if ((f->x + f->w) > (page->win_x + g.x + g.w)) {
+            page->win_x = (f->x + f->w) - (g.x + g.w);
+        }
+        if ((f->y + f->h) > (page->win_y + g.y + g.h)) {
+            page->win_y = (f->y + f->h) - (g.y + g.h);
+        }
     }
-    page->widget_f = widget;
 }
 
 EVEWidget *eve_page_get_focus(EVEPage *page) {
@@ -67,8 +91,8 @@ EVEWidget *eve_page_get_focus(EVEPage *page) {
 }
 
 int eve_page_rect_visible(EVEPage *page, EVERect *g) {
-    uint16_t w = page->window->g.w;
-    uint16_t h = page->window->g.h;
+    uint16_t w = page->v.window->g.w;
+    uint16_t h = page->v.window->g.h;
 
     if (((g->x + g->w) >= page->win_x) && ((g->y + g->h) >= page->win_y) && (g->x <= (page->win_x + w)) && (g->y <= (page->win_y + h))) return 1;
     return 0;