espterm/espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix messed up bg color encoding

Browse Source
This commit is contained in:
MightyPork
2017-09-30 13:52:28 +02:00
parent c83b68405f
commit 062b0e6188
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/screen.c
+12 -11
View File
@@ -1936,13 +1936,6 @@ screenSerializeToBuffer(char *buffer, size_t buf_len, ScreenNotifyTopics topics,
int begun_topic = 0;
int prev_topic = 0;
#define INC_I() do { \
i++; \
if (ss->partial) {\
if (i%W > ss->x_max) i += (W - ss->x_max + ss->x_min - 1);\
} \
} while (0)
#define BEGIN_TOPIC(topic, size) \
if (ss->last_topic == prev_topic) { \
begun_topic = (topic); \
@@ -1964,11 +1957,11 @@ screenSerializeToBuffer(char *buffer, size_t buf_len, ScreenNotifyTopics topics,
bufput_utf8(W);
bufput_utf8(termconf_live.theme);
bufput_utf8(termconf_live.default_fg & 0x000FFF);
bufput_utf8((termconf_live.default_fg & 0xFFF000) >> 12);
bufput_utf8(termconf_live.default_fg & 0xFFF);
bufput_utf8((u32)(termconf_live.default_fg >> 16) & 0xFFFF);
bufput_utf8(termconf_live.default_bg & 0x000FFF);
bufput_utf8((termconf_live.default_bg & 0xFFF000) >> 12);
bufput_utf8(termconf_live.default_bg & 0xFFF);
bufput_utf8((u32)(termconf_live.default_bg >> 16) & 0xFFFF);
bufput_utf8(
(scr.cursor_visible << 0) |
@@ -2065,6 +2058,14 @@ screenSerializeToBuffer(char *buffer, size_t buf_len, ScreenNotifyTopics topics,
}
}
#define INC_I() do { \
i++; \
if (ss->partial) {\
if (i%W == 0) i += (ss->x_min);\
else if (i%W > ss->x_max) i += (W - ss->x_max + ss->x_min - 1);\
} \
} while (0)
// screen contents
int i = ss->index;
if (i == ss->i_start) {