Skip to content

Add support for multi-byte chars like emojis (💡) in light device toggle buttons #24482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aschober wants to merge 4 commits into
base: development
Choose a base branch
from
+67 −28
Open

Add support for multi-byte chars like emojis (💡) in light device toggle buttons #24482

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cf8130
Add support for multi-byte characters like emojis (💡) in WebButton la…
aschober Feb 22, 2026
3c619bb
Use localized `D_BUTTON_TOGGLE` for light device button default text
aschober Feb 22, 2026
af0aa31
Improve UTF-8 support in light device WebButton text
aschober Feb 22, 2026
1802c82
Small tweaks to improve clarity in Utf8Truncate on codepoint limits a…
aschober Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ const char HTTP_END[] PROGMEM =
"</body>"
"</html>";

const char HTTP_DEVICE_CONTROL[] PROGMEM = "<td style='width:%d%%'><button id='o%d' onclick='la(\"&o=%d\");'>%s%s</button></td>"; // ?o is related to WebGetArg(PSTR("o"), tmp, sizeof(tmp))
const char HTTP_DEVICE_CONTROL[] PROGMEM = "<td style='width:%d%%;max-width:0;'><button id='o%d' onclick='la(\"&o=%d\");'><span style='display:block;overflow:hidden;white-space:nowrap'>%s%s</span></button></td>"; // ?o is related to WebGetArg(PSTR("o"), tmp, sizeof(tmp))
const char HTTP_DEVICE_STATE[] PROGMEM = "<td style='width:%d%%;text-align:center;font-weight:%s;font-size:%dpx'>%s</td>";

const char HTTP_STATUS_STICKER[] PROGMEM =
Expand Down Expand Up @@ -1596,14 +1596,10 @@ void HandleRoot(void) {
}

bool set_button = ((button_idx <= MAX_BUTTON_TEXT) && strlen(GetWebButton(button_idx -1)));
char first[2];
snprintf_P(first, sizeof(first), PSTR("%s"), PSTR(D_BUTTON_TOGGLE));
char butt_txt[4];
snprintf_P(butt_txt, sizeof(butt_txt), PSTR("%s"), (set_button) ? HtmlEscape(GetWebButton(button_idx -1)).c_str() : first);
char number[8];
WSContentSend_P(PSTR("<tr>"));
WSContentSend_P(HTTP_DEVICE_CONTROL, 15, button_idx, button_idx,
butt_txt,
(set_button) ? HtmlEscape(GetWebButton(button_idx -1)).c_str() : PSTR("T"),
(set_button) ? "" : itoa(button_idx, number, 10));
button_idx++;

Expand All @@ -1628,13 +1624,9 @@ void HandleRoot(void) {

if (button_idx < (light_device + light_devices)) {
bool set_button = ((button_idx <= MAX_BUTTON_TEXT) && strlen(GetWebButton(button_idx -1)));
char first[2];
snprintf_P(first, sizeof(first), PSTR("%s"), PSTR(D_BUTTON_TOGGLE));
char butt_txt[4];
snprintf_P(butt_txt, sizeof(butt_txt), PSTR("%s"), (set_button) ? HtmlEscape(GetWebButton(button_idx -1)).c_str() : first);
char number[8];
WSContentSend_P(HTTP_DEVICE_CONTROL, 15, button_idx, button_idx,
butt_txt,
(set_button) ? HtmlEscape(GetWebButton(button_idx -1)).c_str() : PSTR("T"),
(set_button) ? "" : itoa(button_idx, number, 10));
button_idx++;
width = 85;
Expand All @@ -1655,15 +1647,10 @@ void HandleRoot(void) {
stemp[0] = 'e'; stemp[1] = '0'; stemp[2] = '\0'; // e0
for (uint32_t i = 0; i < light_devices; i++) {
bool set_button = ((button_idx <= MAX_BUTTON_TEXT) && strlen(GetWebButton(button_idx -1)));
char first[2];
snprintf_P(first, sizeof(first), PSTR("%s"), PSTR(D_BUTTON_TOGGLE));
char butt_txt[4];
snprintf_P(butt_txt, sizeof(butt_txt), PSTR("%s"),
(set_button) ? HtmlEscape(GetWebButton(button_idx -1)).c_str() : first);
char number[8];
WSContentSend_P(PSTR("<tr>"));
WSContentSend_P(HTTP_DEVICE_CONTROL, 15, button_idx, button_idx,
butt_txt,
(set_button) ? HtmlEscape(GetWebButton(button_idx -1)).c_str() : PSTR("T"),
(set_button) ? "" : itoa(button_idx, number, 10));
button_idx++;

Expand Down