summaryrefslogtreecommitdiff
path: root/fw/fe310/eos/eve/screen/page.h
diff options
context:
space:
mode:
Diffstat (limited to 'fw/fe310/eos/eve/screen/page.h')
-rw-r--r--fw/fe310/eos/eve/screen/page.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/fw/fe310/eos/eve/screen/page.h b/fw/fe310/eos/eve/screen/page.h
index 6874a2d..067565b 100644
--- a/fw/fe310/eos/eve/screen/page.h
+++ b/fw/fe310/eos/eve/screen/page.h
@@ -1,7 +1,5 @@
#include <stdint.h>
-#define EVE_PAGE_KBDCH_CLOSE 0x1a
-
#define EVE_PAGE_OPT_SCROLL_X 0x01
#define EVE_PAGE_OPT_SCROLL_Y 0x02
#define EVE_PAGE_OPT_SCROLL_BACK 0x04
@@ -15,8 +13,8 @@ struct EVEWidget;
struct EVEPage;
typedef uint8_t (*eve_page_draw_t) (struct EVEPage *, uint8_t);
-typedef int (*eve_page_touch_t) (struct EVEPage *, EVETouch *, uint16_t, uint8_t);
-typedef int (*eve_page_uievt_t) (struct EVEPage *, uint16_t, void *);
+typedef int (*eve_page_touch_t) (struct EVEPage *, EVETouch *, uint16_t);
+typedef void (*eve_page_uievt_t) (struct EVEPage *, uint16_t, void *);
typedef void (*eve_page_destructor_t) (struct EVEPage *);
typedef struct EVEPage {
@@ -24,19 +22,23 @@ typedef struct EVEPage {
EVERect g;
int16_t x0;
int16_t y0;
- EVEViewStack *stack;
+ EVEVStack *stack;
eve_page_destructor_t destructor;
struct EVEWidget *widget;
uint16_t widget_size;
struct EVEWidget *widget_f;
EVEPhyLHO lho;
- uint32_t lho_t0;
uint8_t track_mode;
uint8_t opt;
} EVEPage;
-void eve_page_init(EVEPage *page, EVEWindow *window, EVEViewStack *stack, struct EVEWidget *widget, uint16_t widget_size, uint8_t opt, eve_page_draw_t draw, eve_page_touch_t touch, eve_page_uievt_t uievt, eve_page_destructor_t destructor);
+void eve_page_init(EVEPage *page, EVEWindow *window, EVEVStack *stack, struct EVEWidget *widget, uint16_t widget_size, uint8_t opt, eve_page_draw_t draw, eve_page_touch_t touch, eve_page_uievt_t uievt, eve_page_destructor_t destructor);
+void eve_page_attach(EVEPage *page, EVEWindow *window, void *page_id);
+void eve_page_detach(EVEPage *page);
+void eve_page_set_param(EVEPage *page, void *param);
+EVEView *eve_page_view(EVEPage *page);
+EVEPage *eve_page_from_view(EVEView *view);
struct EVEWidget *eve_page_widget(EVEPage *page, uint16_t idx);
struct EVEWidget *eve_page_widget_search(EVEPage *page, char *label);
void eve_page_set_widget(EVEPage *page, struct EVEWidget *widget, uint16_t widget_size);
@@ -53,12 +55,12 @@ int16_t eve_page_win_y(EVEPage *page, int16_t y);
/* Page to screen coordinates */
int16_t eve_page_scr_x(EVEPage *page, int16_t x);
int16_t eve_page_scr_y(EVEPage *page, int16_t y);
-int eve_page_rect_visible(EVEPage *page, EVERect *g);
+int eve_page_rect_visible(EVEPage *page, EVERect *rect);
void eve_page_show_rect(EVEPage *page, EVERect *rect);
-int eve_page_oob(EVEPage *page, int *_max_x, int *_max_y);
+int eve_page_oob(EVEPage *page, int *min_x, int *min_y);
struct EVEWidget *eve_page_focus(EVEPage *page);
void eve_page_set_focus(EVEPage *page, struct EVEWidget *widget);
uint8_t eve_page_draw(EVEPage *page, uint8_t tag0);
-int eve_page_touch(EVEPage *page, EVETouch *touch, uint16_t evt, uint8_t tag0);
+int eve_page_touch(EVEPage *page, EVETouch *touch, uint16_t evt);