str widget draw selection and cursor implemented

4 files changed, 8 insertions, 8 deletions

diff --git a/code/fe310/eos/eve/screen/font.c b/code/fe310/eos/eve/screen/font.c
index ae0ac88..6fc7d39 100644
--- a/code/fe310/eos/eve/screen/font.c
+++ b/code/fe310/eos/eve/screen/font.c
@@ -14,7 +14,7 @@ void eve_font_init(EVEFont *font, uint8_t font_id) {
     eve_readb(p, font->w_ch, 128);
 }
 
-uint16_t eve_font_strw(EVEFont *font, char *s) {
+uint16_t eve_font_str_w(EVEFont *font, char *s) {
     uint16_t r = 0;
 
     while (*s) {
@@ -25,7 +25,7 @@ uint16_t eve_font_strw(EVEFont *font, char *s) {
     return r;
 }
 
-uint16_t eve_font_bufw(EVEFont *font, char *buf, uint16_t buf_len) {
+uint16_t eve_font_buf_w(EVEFont *font, char *buf, uint16_t buf_len) {
     int i;
     uint16_t r = 0;
 
diff --git a/code/fe310/eos/eve/screen/font.h b/code/fe310/eos/eve/screen/font.h
index 7de3ff5..525e669 100644
--- a/code/fe310/eos/eve/screen/font.h
+++ b/code/fe310/eos/eve/screen/font.h
@@ -8,6 +8,6 @@ typedef struct EVEFont {
 } EVEFont;
 
 void eve_font_init(EVEFont *font, uint8_t font_id);
-uint16_t eve_font_strw(EVEFont *font, char *s);
-uint16_t eve_font_bufw(EVEFont *font, char *buf, uint16_t buf_len);
+uint16_t eve_font_str_w(EVEFont *font, char *s);
+uint16_t eve_font_buf_w(EVEFont *font, char *buf, uint16_t buf_len);
 uint8_t eve_font_h(EVEFont *font);
diff --git a/code/fe310/eos/eve/screen/page.c b/code/fe310/eos/eve/screen/page.c
index d96a2ba..b1b3985 100644
--- a/code/fe310/eos/eve/screen/page.c
+++ b/code/fe310/eos/eve/screen/page.c
@@ -32,11 +32,11 @@ int16_t eve_page_y(EVEPage *page, int16_t y) {
     return y + page->win_y - page->window->g.y;
 }
 
-int16_t eve_page_scrx(EVEPage *page, int16_t x) {
+int16_t eve_page_scr_x(EVEPage *page, int16_t x) {
     return x - page->win_x + page->window->g.x;
 }
 
-int16_t eve_page_scry(EVEPage *page, int16_t y) {
+int16_t eve_page_scr_y(EVEPage *page, int16_t y) {
     return y - page->win_y + page->window->g.y;
 }
 
diff --git a/code/fe310/eos/eve/screen/page.h b/code/fe310/eos/eve/screen/page.h
index 1db859e..8f2fba9 100644
--- a/code/fe310/eos/eve/screen/page.h
+++ b/code/fe310/eos/eve/screen/page.h
@@ -23,8 +23,8 @@ typedef struct 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, eve_page_evt_handler_t handle_evt, eve_page_g_updater_t update_g, EVEWindow *window);
 int16_t eve_page_x(EVEPage *page, int16_t x);
 int16_t eve_page_y(EVEPage *page, int16_t y);
-int16_t eve_page_scrx(EVEPage *page, int16_t x);
-int16_t eve_page_scry(EVEPage *page, int16_t y);
+int16_t eve_page_scr_x(EVEPage *page, int16_t x);
+int16_t eve_page_scr_y(EVEPage *page, int16_t y);
 
 void eve_page_set_focus(EVEPage *page, struct EVEWidget *widget, EVERect *focus);
 struct EVEWidget *eve_page_get_focus(EVEPage *page);