From 2ede271c65bd5e7240f3e071efa40078815334ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sun, 24 Sep 2017 03:02:28 +0200 Subject: [PATCH] removed obsolete microoptimization from parser repeat code --- user/cgi_main.c | 4 ++-- user/screen.c | 13 +------------ user/screen.h | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/user/cgi_main.c b/user/cgi_main.c index e24e872..f2f6977 100644 --- a/user/cgi_main.c +++ b/user/cgi_main.c @@ -38,11 +38,11 @@ httpd_cgi_state ICACHE_FLASH_ATTR tplScreen(HttpdConnData *connData, char *token tplSend(connData, buff, -1); } else if (streq(token, "default_fg")) { - sprintf(buff, "0x%08X", termconf->default_fg); + sprintf(buff, "%d", termconf->default_fg); tplSend(connData, buff, -1); } else if (streq(token, "default_bg")) { - sprintf(buff, "0x%08X", termconf->default_bg); + sprintf(buff, "%d", termconf->default_bg); tplSend(connData, buff, -1); } diff --git a/user/screen.c b/user/screen.c index 97ef6b9..da235e6 100644 --- a/user/screen.c +++ b/user/screen.c @@ -1689,18 +1689,7 @@ screenSerializeToBuffer(char *buffer, size_t buf_len, void **data) i++; } else { // last character was repeated repCnt times - int savings = ss->lastCharLen*repCnt; - if (savings > 3) { - // Repeat count - bufput_t_utf8(SEQ_TAG_REPEAT, repCnt); - } else { - // repeat it manually - for(int k = 0; k < repCnt; k++) { - for (int j = 0; j < ss->lastCharLen; j++) { - bufput_c(ss->lastChar[j]); - } - } - } + bufput_t_utf8(SEQ_TAG_REPEAT, repCnt); } } diff --git a/user/screen.h b/user/screen.h index 37fc2cb..66b3b01 100644 --- a/user/screen.h +++ b/user/screen.h @@ -77,7 +77,7 @@ enum CursorShape { typedef struct { u32 width; u32 height; - u32 default_bg; // 00-FFh - ANSI colors, (00:00:00-FF:FF:FF)+256 - True Color, 1<<24 + 256 - default from theme + u32 default_bg; // 00-FFh - ANSI colors, (00:00:00-FF:FF:FF)+256 - True Color u32 default_fg; char title[TERM_TITLE_LEN]; char btn[TERM_BTN_COUNT][TERM_BTN_LEN];