circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-21 11:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Rename a variable in utf8_combine for consistency and use 0xfffd for

Browse Source 
unknown Unicode.
This commit is contained in:
nicm 2015-11-14 11:13:44 +00:00
parent dab63b029e
commit f401791a56
1 changed files with 13 additions and 13 deletions

26
utf8.c
View File

@ -474,30 +474,30 @@ utf8_width(u_int uc)
u_int u_int
utf8_combine(const struct utf8_data *ud) utf8_combine(const struct utf8_data *ud)
{ {
u_int value; u_int uc;
value = 0xff; uc = 0xfffd;
switch (ud->size) { switch (ud->size) {
case 1: case 1:
value = ud->data[0]; uc = ud->data[0];
break; break;
case 2: case 2:
value = ud->data[1] & 0x3f; uc = ud->data[1] & 0x3f;
value |= (ud->data[0] & 0x1f) << 6; uc |= (ud->data[0] & 0x1f) << 6;
break; break;
case 3: case 3:
value = ud->data[2] & 0x3f; uc = ud->data[2] & 0x3f;
value |= (ud->data[1] & 0x3f) << 6; uc |= (ud->data[1] & 0x3f) << 6;
value |= (ud->data[0] & 0xf) << 12; uc |= (ud->data[0] & 0xf) << 12;
break; break;
case 4: case 4:
value = ud->data[3] & 0x3f; uc = ud->data[3] & 0x3f;
value |= (ud->data[2] & 0x3f) << 6; uc |= (ud->data[2] & 0x3f) << 6;
value |= (ud->data[1] & 0x3f) << 12; uc |= (ud->data[1] & 0x3f) << 12;
value |= (ud->data[0] & 0x7) << 18; uc |= (ud->data[0] & 0x7) << 18;
break; break;
} }
return (value); return (uc);
} }
/* Split 32-bit Unicode into UTF-8. */ /* Split 32-bit Unicode into UTF-8. */