summaryrefslogtreecommitdiff
path: root/code/fe310
diff options
context:
space:
mode:
authorUros Majstorovic <majstor@majstor.org>2020-07-02 20:32:50 +0200
committerUros Majstorovic <majstor@majstor.org>2020-07-02 20:32:50 +0200
commitdabbf944711eef384dcc87b2d49843bedcb1e84a (patch)
treebab3fc421c7df9c200ec054ed4a2ec103376f383 /code/fe310
parentd3d239fa9cb25b4a3656c09dbb38f5743d51a213 (diff)
copy/paste for text widget implemented
Diffstat (limited to 'code/fe310')
-rw-r--r--code/fe310/eos/eve/screen/font.c15
-rw-r--r--code/fe310/eos/eve/screen/font.h5
-rw-r--r--code/fe310/eos/eve/screen/form.c6
-rw-r--r--code/fe310/eos/eve/widget/label.c4
-rw-r--r--code/fe310/eos/eve/widget/page.c4
-rw-r--r--code/fe310/eos/eve/widget/text.c177
-rw-r--r--code/fe310/eos/eve/widget/text.h4
7 files changed, 142 insertions, 73 deletions
diff --git a/code/fe310/eos/eve/screen/font.c b/code/fe310/eos/eve/screen/font.c
index 1441961..ae0ac88 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_string_width(EVEFont *font, char *s) {
+uint16_t eve_font_strw(EVEFont *font, char *s) {
uint16_t r = 0;
while (*s) {
@@ -25,6 +25,17 @@ uint16_t eve_font_string_width(EVEFont *font, char *s) {
return r;
}
-uint8_t eve_font_height(EVEFont *font) {
+uint16_t eve_font_bufw(EVEFont *font, char *buf, uint16_t buf_len) {
+ int i;
+ uint16_t r = 0;
+
+ for (i=0; i<buf_len; i++) {
+ r += font->w_ch[*(buf + i)];
+ }
+
+ return r;
+}
+
+uint8_t eve_font_h(EVEFont *font) {
return font->h;
} \ No newline at end of file
diff --git a/code/fe310/eos/eve/screen/font.h b/code/fe310/eos/eve/screen/font.h
index a46c942..7de3ff5 100644
--- a/code/fe310/eos/eve/screen/font.h
+++ b/code/fe310/eos/eve/screen/font.h
@@ -8,5 +8,6 @@ typedef struct EVEFont {
} EVEFont;
void eve_font_init(EVEFont *font, uint8_t font_id);
-uint16_t eve_font_string_width(EVEFont *font, char *s);
-uint8_t eve_font_height(EVEFont *font);
+uint16_t eve_font_strw(EVEFont *font, char *s);
+uint16_t eve_font_bufw(EVEFont *font, char *buf, uint16_t buf_len);
+uint8_t eve_font_h(EVEFont *font);
diff --git a/code/fe310/eos/eve/screen/form.c b/code/fe310/eos/eve/screen/form.c
index 442b329..f84b0d7 100644
--- a/code/fe310/eos/eve/screen/form.c
+++ b/code/fe310/eos/eve/screen/form.c
@@ -33,11 +33,10 @@ int eve_form_touch(EVEView *v, uint8_t tag0, int touch_idx) {
for (i=0; i<form->widget_size; i++) {
if (eve_page_rect_visible(&form->p, &widget->g)) {
int a;
- EVERect r = {0,0,0,0};
- a = widget->touch(widget, &form->p, tag0, touch_idx, &r);
+ a = widget->touch(widget, &form->p, tag0, touch_idx, &focus);
ret = ret || a;
- if (r.w && r.h && (widget_f != widget)) {
+ if (focus.w && focus.h && (widget_f != widget)) {
EVEKbd *kbd = eve_screen_get_kbd(form->p.window->screen);
if (kbd) {
@@ -51,7 +50,6 @@ int eve_form_touch(EVEView *v, uint8_t tag0, int touch_idx) {
}
}
widget_f = widget;
- focus = r;
}
}
widget = eve_widget_next(widget);
diff --git a/code/fe310/eos/eve/widget/label.c b/code/fe310/eos/eve/widget/label.c
index 6013a22..f47b7f4 100644
--- a/code/fe310/eos/eve/widget/label.c
+++ b/code/fe310/eos/eve/widget/label.c
@@ -16,8 +16,8 @@ void eve_label_init(EVELabel *label, EVERect *g, char *title, EVEFont *font) {
if (g) label->g = *g;
label->title = title;
label->font = font;
- if (label->g.w == 0) label->g.w = eve_font_string_width(font, label->title);
- if (label->g.h == 0) label->g.h = eve_font_height(font);
+ if (label->g.w == 0) label->g.w = eve_font_strw(font, label->title);
+ if (label->g.h == 0) label->g.h = eve_font_h(font);
}
void eve_label_draw(EVELabel *label) {
diff --git a/code/fe310/eos/eve/widget/page.c b/code/fe310/eos/eve/widget/page.c
index fad44ad..4c35bda 100644
--- a/code/fe310/eos/eve/widget/page.c
+++ b/code/fe310/eos/eve/widget/page.c
@@ -21,8 +21,8 @@ void eve_pagew_init(EVEPageWidget *widget, EVERect *g, char *title, EVEFont *fon
widget->title = title;
widget->font = font;
widget->page = page;
- if (_widget->g.w == 0) _widget->g.w = eve_font_string_width(font, widget->title);
- if (_widget->g.h == 0) _widget->g.h = eve_font_height(font);
+ if (_widget->g.w == 0) _widget->g.w = eve_font_strw(font, widget->title);
+ if (_widget->g.h == 0) _widget->g.h = eve_font_h(font);
}
int eve_pagew_touch(EVEWidget *_widget, EVEPage *page, uint8_t tag0, int touch_idx, EVERect *focus) {
diff --git a/code/fe310/eos/eve/widget/text.c b/code/fe310/eos/eve/widget/text.c
index e38741e..a424b9d 100644
--- a/code/fe310/eos/eve/widget/text.c
+++ b/code/fe310/eos/eve/widget/text.c
@@ -14,19 +14,25 @@
#include "widget.h"
#include "text.h"
-#define CH_BS 0x08
-#define CH_DEL 0x7f
-#define CH_EOF 0x1a
+#define CH_BS 0x08
+#define CH_DEL 0x7f
+#define CH_EOF 0x1a
-#define TEXTW_TMODE_CURSOR 1
-#define TEXTW_TMODE_SCROLL 2
+#define CH_CTRLX 0x18
+#define CH_CTRLC 0x03
+#define CH_CTRLV 0x16
-#define LINE_LEN(w,l) ((l) ? (w->line[l] ? w->line[l] - w->line[(l) - 1] - 1 : 0) : w->line[l])
-#define LINE_START(w,l) ((l) ? w->line[(l) - 1] + 1 : 0)
-#define LINE_END(w,l) (w->line[l])
-#define LINE_EMPTY 0xffff
+#define TEXTW_TMODE_CURSOR 1
+#define TEXTW_TMODE_SCROLL 2
-void eve_textw_init(EVETextWidget *widget, EVERect *g, EVEFont *font, char *text, uint64_t text_size, uint16_t *line, uint16_t line_size) {
+#define LINE_LEN(w,l) ((l) ? (w->line[l] ? w->line[l] - w->line[(l) - 1] - 1 : 0) : w->line[l])
+#define LINE_START(w,l) ((l) ? w->line[(l) - 1] + 1 : 0)
+#define LINE_END(w,l) (w->line[l])
+#define LINE_EMPTY 0xffff
+
+#define CHAR_VALID_INPUT(c) (((c >= 0x20) && (c < 0x7f)) || (c == '\n'))
+
+void eve_textw_init(EVETextWidget *widget, EVERect *g, EVEFont *font, char *text, uint16_t text_size, uint16_t *line, uint16_t line_size) {
EVEWidget *_widget = &widget->w;
memset(widget, 0, sizeof(EVETextWidget));
@@ -87,12 +93,16 @@ int eve_textw_touch(EVEWidget *_widget, EVEPage *page, uint8_t tag0, int touch_i
}
}
- if ((evt & EVE_TOUCH_ETYPE_TRACK_MASK) && (widget->track.mode == TEXTW_TMODE_SCROLL)) {
- if (page && page->handle_evt) page->handle_evt(page, _widget, t, evt, tag0, touch_idx);
- } else {
- if (widget->track.mode) {
+ switch (widget->track.mode) {
+ case TEXTW_TMODE_SCROLL:
+ if (page && page->handle_evt) page->handle_evt(page, _widget, t, evt, tag0, touch_idx);
+ break;
+
+ case TEXTW_TMODE_CURSOR:
if (evt & EVE_TOUCH_ETYPE_TRACK) eve_textw_cursor_set(widget, widget->track.cursor, t->tag + widget->track.dl, eve_page_x(page, t->x) + widget->track.dx);
- } else {
+ break;
+
+ default:
if (evt & EVE_TOUCH_ETYPE_LPRESS) {
if (widget->cursor2.on) {
// copy
@@ -101,7 +111,6 @@ int eve_textw_touch(EVEWidget *_widget, EVEPage *page, uint8_t tag0, int touch_i
// paste
} else {
eve_textw_cursor_set(widget, &widget->cursor2, t->tag, eve_page_x(page, t->x));
- widget->cursor_f = &widget->cursor2;
}
} else {
// select
@@ -112,22 +121,27 @@ int eve_textw_touch(EVEWidget *_widget, EVEPage *page, uint8_t tag0, int touch_i
if (widget->cursor2.on) eve_textw_cursor_clear(widget, &widget->cursor2);
widget->cursor_f = &widget->cursor1;
}
- }
+ break;
+ }
+
+ if (evt & EVE_TOUCH_ETYPE_TRACK_STOP) {
+ widget->track.mode = 0;
+ widget->track.cursor = NULL;
+ widget->track.dx = 0;
+ widget->track.dl = 0;
}
+
ret = 1;
}
- if (evt & EVE_TOUCH_ETYPE_TRACK_STOP) {
- widget->track.mode = 0;
- widget->track.cursor = NULL;
- widget->track.dx = 0;
- widget->track.dl = 0;
- }
+
if (widget->cursor_f && focus) {
focus->x = _widget->g.x;
focus->y = _widget->g.y + widget->cursor_f->line * widget->font->h;
focus->w = _widget->g.w;
focus->h = 2 * widget->font->h;
+ widget->cursor_f = NULL;
}
+
return ret;
}
@@ -140,6 +154,7 @@ static void _draw_line(EVETextWidget *widget, uint16_t l, uint16_t ch, uint16_t
eve_cmd_dl(VERTEX2F(_widget->g.x + x1, _widget->g.y + l * widget->font->h));
eve_cmd_dl(VERTEX2F(_widget->g.x + x2, _widget->g.y + (l + 1) * widget->font->h));
if (!s) eve_cmd_dl(COLOR_MASK(1 ,1 ,1 ,1));
+ eve_cmd_dl(END());
if (len) {
if (s) eve_cmd_dl(COLOR_RGB(0, 0, 0));
eve_cmd(CMD_TEXT, "hhhhpb", _widget->g.x, _widget->g.y + l * widget->font->h, widget->font->id, 0, widget->text + ch, len, 0);
@@ -262,70 +277,115 @@ uint8_t eve_textw_draw(EVEWidget *_widget, EVEPage *page, uint8_t tag0) {
}
void eve_textw_putc(void *_page, int c) {
- int i, r;
EVEPage *page = _page;
EVETextWidget *widget = (EVETextWidget *)eve_page_get_focus(page);
EVETextCursor *cursor1 = &widget->cursor1;
EVETextCursor *cursor2 = &widget->cursor2;
+ char *text;
+ int i, r, ins_c = 0, del_c = 0;
+ int ch_w = 0;
if (c == CH_EOF) {
- if (widget->cursor1.on) eve_textw_cursor_clear(widget, &widget->cursor1);
- if (widget->cursor2.on) eve_textw_cursor_clear(widget, &widget->cursor2);
+ if (cursor1->on) eve_textw_cursor_clear(widget, cursor1);
+ if (cursor2->on) eve_textw_cursor_clear(widget, cursor2);
return;
}
- if (cursor1->on) {
- char m = 0;
- char *text = widget->text + cursor1->ch;
+ if (cursor2->on) {
+ EVETextCursor *c1;
+ EVETextCursor *c2;
+ char *clipb = NULL;
+
+ if (cursor1->ch <= cursor2->ch) {
+ c1 = cursor1;
+ c2 = cursor2;
+ } else {
+ c1 = cursor2;
+ c2 = cursor1;
+ }
+
+ text = widget->text + c1->ch;
+ del_c = c2->ch - c1->ch;
+ if ((c == CH_CTRLX) || (c == CH_CTRLC)) {
+ // eve_clipb_push(text, del_c);
+ if (c == CH_CTRLC) return;
+ }
+ if (CHAR_VALID_INPUT(c) && (widget->text_len < widget->text_size + del_c - 1)) {
+ ins_c = 1;
+ ch_w = widget->font->w_ch[c];
+ } else if (c == CH_CTRLV) {
+ // clipb = eve_clipb_pop();
+ ins_c = clipb ? strlen(clipb) : 0;
+ if (ins_c) {
+ if (widget->text_len >= widget->text_size - (ins_c - del_c)) ins_c = widget->text_size - widget->text_len + del_c - 1;
+ ch_w = eve_font_bufw(widget->font, clipb, ins_c);
+ }
+ }
+ if (ins_c != del_c) memmove(text + ins_c, text + del_c, widget->text_len - c2->ch + 1);
+ if (ins_c) {
+ if (c == CH_CTRLV) {
+ memcpy(text, clipb, ins_c);
+ } else {
+ *text = c;
+ }
+ c1->ch += ins_c;
+ }
+ if (c1 == cursor2) widget->cursor1 = widget->cursor2;
+ eve_textw_cursor_clear(widget, cursor2);
+ } else if (cursor1->on) {
+ text = widget->text + cursor1->ch;
switch (c) {
case CH_BS:
if (cursor1->ch > 0) {
- cursor1->x -= widget->font->w_ch[*(text - 1)];
+ ch_w = -widget->font->w_ch[*(text - 1)];
memmove(text - 1, text, widget->text_len - cursor1->ch + 1);
- widget->text_len--;
cursor1->ch--;
- m = -1;
+ del_c = 1;
}
break;
+
case CH_DEL:
if (cursor1->ch < widget->text_len) {
memmove(text, text + 1, widget->text_len - cursor1->ch);
- widget->text_len--;
- m = -1;
+ del_c = 1;
}
break;
+
default:
- if (widget->text_len < (widget->text_size - 1)) {
- cursor1->x += widget->font->w_ch[c];
+ if (CHAR_VALID_INPUT(c) && (widget->text_len < widget->text_size - 1)) {
+ ch_w = widget->font->w_ch[c];
memmove(text + 1, text, widget->text_len - cursor1->ch + 1);
*text = c;
- widget->text_len++;
cursor1->ch++;
- m = 1;
+ ins_c = 1;
}
break;
}
+ }
- if (m == 0) return;
- for (i=cursor1->line; i<widget->line_len; i++) {
- widget->line[i] += m;
- }
- r = cursor1->line;
- if (cursor1->line) r = eve_textw_update(widget, page, cursor1->line - 1);
- if (r == cursor1->line) r = eve_textw_update(widget, page, cursor1->line);
- if (r < 0) return;
-
- if (cursor1->ch > widget->text_len) cursor1->ch = widget->text_len;
- if (r != cursor1->line) {
- if (cursor1->line && (cursor1->ch < LINE_START(widget, cursor1->line))) {
- cursor1->line--;
- eve_textw_cursor_update(widget, cursor1);
- } else if (cursor1->ch > LINE_END(widget, cursor1->line)) {
- cursor1->line++;
- eve_textw_cursor_update(widget, cursor1);
- }
- }
+ if ((ins_c == 0) && (del_c == 0)) return;
+
+ widget->text_len += ins_c - del_c;
+ for (i=cursor1->line; i<widget->line_len; i++) {
+ widget->line[i] += ins_c - del_c;
+ }
+
+ r = cursor1->line;
+ if (cursor1->line) r = eve_textw_update(widget, page, cursor1->line - 1);
+ if ((cursor1->line == 0) || (r == cursor1->line - 1)) r = eve_textw_update(widget, page, cursor1->line);
+ if (r < 0) return;
+
+ if (cursor1->line && (cursor1->ch < LINE_START(widget, cursor1->line))) {
+ cursor1->line--;
+ widget->cursor_f = cursor1;
+ eve_textw_cursor_update(widget, cursor1);
+ } else if (cursor1->ch > LINE_END(widget, cursor1->line)) {
+ while (cursor1->ch > LINE_END(widget, cursor1->line)) cursor1->line++;
+ widget->cursor_f = cursor1;
+ eve_textw_cursor_update(widget, cursor1);
+ } else {
+ cursor1->x += ch_w;
}
}
@@ -342,7 +402,7 @@ int eve_textw_update(EVETextWidget *widget, EVEPage *page, uint16_t line) {
line_b = LINE_EMPTY;
for (i=LINE_START(widget, line); i<widget->text_size; i++) {
ch = widget->text[i];
- ch_w = widget->font->w_ch[ch];
+ if (ch < 128) ch_w = widget->font->w_ch[ch];
if (ch <= 0x20) {
if ((ch == '\n') || (ch == '\0')) {
if (widget->line[line] == i) return line;
@@ -446,5 +506,4 @@ void eve_textw_cursor_set(EVETextWidget *widget, EVETextCursor *cursor, uint8_t
void eve_textw_cursor_clear(EVETextWidget *widget, EVETextCursor *cursor) {
cursor->on = 0;
- if (widget->cursor_f == cursor) widget->cursor_f = NULL;
}
diff --git a/code/fe310/eos/eve/widget/text.h b/code/fe310/eos/eve/widget/text.h
index 745274d..68176f1 100644
--- a/code/fe310/eos/eve/widget/text.h
+++ b/code/fe310/eos/eve/widget/text.h
@@ -9,13 +9,13 @@ typedef struct EVETextCursor {
typedef struct EVETextWidget {
EVEWidget w;
+ EVEFont *font;
char *text;
uint16_t text_size;
uint16_t text_len;
uint16_t *line;
uint16_t line_size;
uint16_t line_len;
- EVEFont *font;
EVETextCursor cursor1;
EVETextCursor cursor2;
EVETextCursor *cursor_f;
@@ -30,7 +30,7 @@ typedef struct EVETextWidget {
} track;
} EVETextWidget;
-void eve_textw_init(EVETextWidget *widget, EVERect *g, EVEFont *font, char *text, uint64_t text_size, uint16_t *line, uint16_t line_size);
+void eve_textw_init(EVETextWidget *widget, EVERect *g, EVEFont *font, char *text, uint16_t text_size, uint16_t *line, uint16_t line_size);
int eve_textw_touch(EVEWidget *_widget, EVEPage *page, uint8_t tag0, int touch_idx, EVERect *focus);
uint8_t eve_textw_draw(EVEWidget *_widget, EVEPage *page, uint8_t tag0);
void eve_textw_putc(void *_w, int c);