page/form refactor; implemented form layout, labels

1 files changed, 7 insertions, 4 deletions

diff --git a/code/fe310/eos/eve/screen/page.h b/code/fe310/eos/eve/screen/page.h
index 42cae7d..a2e5898 100644
--- a/code/fe310/eos/eve/screen/page.h
+++ b/code/fe310/eos/eve/screen/page.h
@@ -6,6 +6,7 @@ struct EVEWidget;
 typedef void (*eve_page_open_t) (struct EVEPage *, struct EVEPage *);
 typedef void (*eve_page_close_t) (struct EVEPage *);
 typedef void (*eve_page_evt_handler_t) (struct EVEPage *, struct EVEWidget *, EVETouch *, uint16_t, uint8_t, int);
+typedef void (*eve_page_g_updater_t) (struct EVEPage *, struct EVEWidget *);
 
 typedef struct EVEPage {
     EVEView v;
@@ -14,10 +15,12 @@ typedef struct EVEPage {
     eve_page_open_t open;
     eve_page_close_t close;
     eve_page_evt_handler_t handle_evt;
+    eve_page_g_updater_t update_g;
+    struct EVEWidget *widget_f;
     EVEWindow *window;
 } EVEPage;
 
-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, EVEWindow *window);
-void eve_page_focus(EVEPage *page, EVERect *focus);
-int eve_page_widget_visible(EVEPage *page, struct EVEWidget *widget);
-void eve_page_handle_evt(EVEPage *page, struct EVEWidget *widget, EVETouch *touch, uint16_t evt, uint8_t tag0, int touch_idx);
+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);
+void eve_page_set_focus(EVEPage *page, struct EVEWidget *widget, EVERect *focus);
+struct EVEWidget *eve_page_get_focus(EVEPage *page);
+int eve_page_rect_visible(EVEPage *page, EVERect *g);