Fix incorrect calculation of codepoint from UTF-16 surrogate pair.

gwsw · Sep 2, 2023 · 378fc4b · 378fc4b
1 parent 1dd362c
commit 378fc4b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/screen.c b/screen.c
@@ -2850,11 +2850,11 @@ static int console_input(HANDLE tty, XINPUT_RECORD *xip)
  }
 
  if (ch >= 0xD800 && ch < 0xDC00) { /* high surrogate */
- hi_surr = 0x10000 | ((ch - 0xD800) << 10);
+ hi_surr = 0x10000 + ((ch - 0xD800) << 10);
  return (FALSE);
  }
  if (ch >= 0xDC00 && ch < 0xE000) { /* low surrogate */
- xip->ichar = hi_surr | (ch - 0xDC00);
+ xip->ichar = hi_surr + (ch - 0xDC00);
  hi_surr = 0;
  }
  }