From daa87d92b3df433578e53284a8c88083e24f8623 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Sat, 27 Mar 2021 22:08:31 +0100 Subject: form/app cleanup; scroll infrastructure --- fw/fe310/eos/eve/widget/selectw.c | 132 ++++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 63 deletions(-) (limited to 'fw/fe310/eos/eve/widget/selectw.c') diff --git a/fw/fe310/eos/eve/widget/selectw.c b/fw/fe310/eos/eve/widget/selectw.c index d1d1959..7873e95 100644 --- a/fw/fe310/eos/eve/widget/selectw.c +++ b/fw/fe310/eos/eve/widget/selectw.c @@ -12,16 +12,18 @@ #include "widget.h" #include "selectw.h" -#define SELECTW_NOSELECT 0xffffffff +#define SELECTW_NOSELECT 0xffffffff -static int _selectw_verify(utf8_t *opt, uint16_t size) { +#define DIVC(x,y) ((x) / (y) + ((x) % (y) != 0)) + +static int _selectw_verify(utf8_t *option, uint16_t option_size) { int o_len; uint16_t o_curr; int rv; o_curr = 0; - while (o_curr < size) { - rv = utf8_verify(opt + o_curr, size - o_curr, &o_len); + while (o_curr < option_size) { + rv = utf8_verify(option + o_curr, option_size - o_curr, &o_len); if (rv) return EVE_ERR; if (o_len == 0) return EVE_OK; o_curr += o_len + 1; @@ -49,12 +51,12 @@ static int _selectw_count(EVESelectWidget *widget) { return i; } -static void _selectw_update_sz(EVESelectWidget *widget, int i) { +static void _selectw_update_sz(EVESelectWidget *widget, int uievt) { EVEWidget *_widget = &widget->w; EVEPage *page = _widget->page; - _widget->g.h = i * widget->font->h; - eve_widget_uievt_push(_widget, EVE_UIEVT_WIDGET_UPDATE_G, NULL); + _widget->g.h = widget->option_count * widget->font->h; + if (uievt) eve_view_uievt_push(&page->v, EVE_UIEVT_WIDGET_UPDATE_G, _widget); } int eve_selectw_create(EVESelectWidget *widget, EVERect *g, EVEPage *page, EVESelectSpec *spec) { @@ -74,30 +76,20 @@ int eve_selectw_create(EVESelectWidget *widget, EVERect *g, EVEPage *page, EVESe void eve_selectw_init(EVESelectWidget *widget, EVERect *g, EVEPage *page, EVEFont *font, utf8_t *option, uint16_t option_size, uint8_t multi) { EVEWidget *_widget = &widget->w; + int rv; memset(widget, 0, sizeof(EVESelectWidget)); eve_widget_init(_widget, EVE_WIDGET_TYPE_SELECT, g, page, eve_selectw_draw, eve_selectw_touch, NULL); - eve_selectw_update(widget, font, option, option_size); - widget->multi = multi; -} - -void eve_selectw_update(EVESelectWidget *widget, EVEFont *font, utf8_t *option, uint16_t option_size) { - int rv, text_len; - - if (font) widget->font = font; - if (option) { - int rv = _selectw_verify(option, option_size); - if (rv == EVE_OK) { - int i; - - widget->option = option; - widget->option_size = option_size; - widget->select = widget->multi ? 0 : SELECTW_NOSELECT; - - i = _selectw_count(widget); - _selectw_update_sz(widget, i); - } + widget->font = font; + rv = _selectw_verify(option, option_size); + if (rv == EVE_OK) { + widget->option = option; + widget->option_size = option_size; + widget->option_count = _selectw_count(widget); + _selectw_update_sz(widget, 0); } + widget->multi = multi; + widget->select = widget->multi ? 0 : SELECTW_NOSELECT; } void eve_selectw_destroy(EVESelectWidget *widget) { @@ -109,40 +101,53 @@ uint8_t eve_selectw_draw(EVEWidget *_widget, uint8_t tag0) { EVESelectWidget *widget = (EVESelectWidget *)_widget; int o_len; int o_curr; - int i = 0, s; + int i, s; int16_t x1, x2, y1, y2; uint16_t new_h; + int line0, lineN; + + line0 = -((int)eve_page_win_y(page, _widget->g.y)) / widget->font->h; + lineN = DIVC((-((int)eve_page_win_y(page, _widget->g.y)) + page->v.window->g.h), widget->font->h); + if (line0 < 0) line0 = 0; + if (lineN < 0) lineN = 0; + if (line0 > widget->option_count) line0 = widget->option_count; + if (lineN > widget->option_count) lineN = widget->option_count; + _widget->tag0 = tag0; _widget->tagN = tag0; + widget->line0 = line0; + o_curr = 0; + i = 0; do { o_len = strnlen(widget->option + o_curr, widget->option_size - o_curr); if (!o_len || (o_len == widget->option_size - o_curr)) break; - - if (_widget->tagN != EVE_TAG_NOTAG) { - eve_cmd_dl(TAG(_widget->tagN)); - _widget->tagN++; - } - s = widget->multi ? widget->select & (0x1 << i) : widget->select == i; - x1 = _widget->g.x; - x2 = x1 + _widget->g.w; - y1 = _widget->g.y + i * widget->font->h; - y2 = y1 + widget->font->h; - eve_cmd_dl(BEGIN(EVE_RECTS)); - if (!s) eve_cmd_dl(COLOR_MASK(0 ,0 ,0 ,0)); - eve_cmd_dl(VERTEX2F(x1, y1)); - eve_cmd_dl(VERTEX2F(x2, y2)); - if (!s) { - eve_cmd_dl(COLOR_MASK(1 ,1 ,1 ,1)); - eve_cmd_dl(BEGIN(EVE_LINES)); - eve_cmd_dl(VERTEX2F(x1, y2)); + if ((i >= line0) && (i < lineN)) { + if (_widget->tagN != EVE_NOTAG) { + eve_cmd_dl(TAG(_widget->tagN)); + _widget->tagN++; + } + s = widget->multi ? widget->select & (0x1 << i) : widget->select == i; + x1 = _widget->g.x; + x2 = x1 + _widget->g.w; + y1 = _widget->g.y + i * widget->font->h; + y2 = y1 + widget->font->h; + eve_cmd_dl(BEGIN(EVE_RECTS)); + if (!s) eve_cmd_dl(COLOR_MASK(0 ,0 ,0 ,0)); + eve_cmd_dl(VERTEX2F(x1, y1)); eve_cmd_dl(VERTEX2F(x2, y2)); + if (!s) { + eve_cmd_dl(COLOR_MASK(1 ,1 ,1 ,1)); + eve_cmd_dl(BEGIN(EVE_LINES)); + eve_cmd_dl(VERTEX2F(x1, y2)); + eve_cmd_dl(VERTEX2F(x2, y2)); + } + eve_cmd_dl(END()); + if (s) eve_cmd_dl(COLOR_RGBC(page->v.color_bg)); + eve_cmd(CMD_TEXT, "hhhhs", x1, y1, widget->font->id, 0, widget->option + o_curr); + if (s) eve_cmd_dl(COLOR_RGBC(page->v.color_fg)); } - eve_cmd_dl(END()); - if (s) eve_cmd_dl(COLOR_RGBC(page->v.color_bg)); - eve_cmd(CMD_TEXT, "hhhhs", x1, y1, widget->font->id, 0, widget->option + o_curr); - if (s) eve_cmd_dl(COLOR_RGBC(page->v.color_fg)); o_curr += o_len + 1; i++; @@ -155,7 +160,7 @@ int eve_selectw_touch(EVEWidget *_widget, EVETouch *touch, uint16_t evt) { EVESelectWidget *widget = (EVESelectWidget *)_widget; if (evt & EVE_TOUCH_ETYPE_TAG_UP) { - int i = touch->tag0 - _widget->tag0; + int i = touch->tag0 - _widget->tag0 + widget->line0; if (widget->multi) { uint32_t f = (0x1 << i); @@ -198,12 +203,12 @@ utf8_t *eve_selectw_option_get_select(EVESelectWidget *widget) { return eve_selectw_option_get(widget, widget->select); } -int eve_selectw_option_add(EVESelectWidget *widget, utf8_t *opt) { +int eve_selectw_option_add(EVESelectWidget *widget, utf8_t *option) { int o_len; int o_curr; int rv, i; - rv = utf8_verify(opt, strlen(opt) + 1, NULL); + rv = utf8_verify(option, strlen(option) + 1, NULL); if (rv) return EVE_ERR; o_curr = 0; @@ -217,26 +222,27 @@ int eve_selectw_option_add(EVESelectWidget *widget, utf8_t *opt) { } } while (o_len); - if (o_curr + strlen(opt) + 1 > widget->option_size) return EVE_ERR_FULL; - strcpy(widget->option + o_curr, opt); + if (o_curr + strlen(option) + 1 > widget->option_size) return EVE_ERR_FULL; + strcpy(widget->option + o_curr, option); - _selectw_update_sz(widget, i + 1); + widget->option_count = i + 1; + _selectw_update_sz(widget, 1); return EVE_OK; } -int eve_selectw_option_set(EVESelectWidget *widget, utf8_t *opt, uint16_t size) { +int eve_selectw_option_set(EVESelectWidget *widget, utf8_t *option, uint16_t option_size) { int rv, i; - rv = _selectw_verify(opt, size); + rv = _selectw_verify(option, option_size); if (rv) return rv; - if (size > widget->option_size) return EVE_ERR_FULL; + if (option_size > widget->option_size) return EVE_ERR_FULL; - memcpy(widget->option, opt, size); - memset(widget->option + size, 0, widget->option_size - size); + memcpy(widget->option, option, option_size); + memset(widget->option + option_size, 0, widget->option_size - option_size); - i = _selectw_count(widget); - _selectw_update_sz(widget, i); + widget->option_count = _selectw_count(widget); + _selectw_update_sz(widget, 1); return EVE_OK; } -- cgit v1.2.3