summaryrefslogtreecommitdiff
path: root/src/mark.c
diff options
context:
space:
mode:
authorAmadeusz Sławiński <amade@asmblr.net>2018-03-03 17:40:48 +0100
committerAmadeusz Sławiński <amade@asmblr.net>2018-03-03 18:52:49 +0100
commitf18f5d0da1d4535c617d0b8d4c6ea7b7288ac623 (patch)
tree6938acba1255401df1e00695bc71d8e9d61094a2 /src/mark.c
parentaf05a4a6e58070a24b95ed1632e848206343f704 (diff)
downloadscreen-f18f5d0da1d4535c617d0b8d4c6ea7b7288ac623.tar.gz
get rid of fontx
in UTF8 encodings it was used to store part of character (c << 16), but now that character is ensured to be 32 bits, it's not needed
Diffstat (limited to 'src/mark.c')
-rw-r--r--src/mark.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mark.c b/src/mark.c
index 0536349..05f47cd 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -244,7 +244,7 @@ static int rem(int x1, int y1, int x2, int y2, int redisplay, char *pt, int yend
uint32_t *im;
struct mline *ml;
int font;
- uint32_t *fo, *fox;
+ uint32_t *fo;
markdata->second = 0;
if (y2 < y1 || ((y2 == y1) && (x2 < x1))) {
@@ -285,14 +285,12 @@ static int rem(int x1, int y1, int x2, int y2, int redisplay, char *pt, int yend
j--;
im = ml->image + j;
fo = ml->font + j;
- fox = ml->fontx + j;
font = ASCII;
for (; j <= to; j++) {
uint32_t c = *im++;
uint32_t cf = *fo++;
- uint32_t cfx = *fox++;
if (fore->w_encoding == UTF8) {
- c |= cf << 8 | cfx << 16;
+ c |= cf << 8;
if (c == UCS_HIDDEN)
continue;
c = ToUtf8_comb(pt, c);
@@ -1098,7 +1096,6 @@ void revto_line(int tx, int ty, int line)
mc = mchar_so;
if (pastefont) {
mc.font = ml->font[x];
- mc.fontx = ml->fontx[x];
}
mc.image = ml->image[x];
} else
@@ -1199,7 +1196,6 @@ static void MarkRedisplayLine(int y, int xs, int xe, int isblank)
break;
if (pastefont) {
mchar_marked.font = ml->font[x];
- mchar_marked.fontx = ml->fontx[x];
}
mchar_marked.image = ml->image[x];
mchar_marked.mbcs = 0;