Mirrorlandia_minetest/display_modpack
1
0
Fork 0
mirror of https://github.com/pyrollo/display_modpack.git synced 2024-11-30 18:13:43 +01:00
Code Issues Projects Releases Wiki Activity

Better management of invalid UTF strings

Browse Source
This commit is contained in:
Pierre-Yves Rollo 2018-12-11 11:26:50 +01:00
parent f46dd0a72e
commit feb1b639ff
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
font_api/font.lua
View File

@ -39,14 +39,15 @@ local function char_to_codepoint(str)
local bytes = get_char_bytes(str) local bytes = get_char_bytes(str)
if bytes == 1 then if bytes == 1 then
return str:byte(1) return str:byte(1)
elseif bytes == 2 then elseif bytes == 2 and str:byte(2) ~= nil then
return (str:byte(1) - 0xC2) * 0x40 return (str:byte(1) - 0xC2) * 0x40
+ str:byte(2) + str:byte(2)
elseif bytes == 3 then elseif bytes == 3 and str:byte(2) ~= nil and str:byte(3) ~= nil then
return (str:byte(1) - 0xE0) * 0x1000 return (str:byte(1) - 0xE0) * 0x1000
+ str:byte(2) % 0x40 * 0x40 + str:byte(2) % 0x40 * 0x40
+ str:byte(3) % 0x40 + str:byte(3) % 0x40
elseif bytes == 4 then -- Not tested elseif bytes == 4 and str:byte(2) ~= nil and str:byte(3) ~= nil
and str:byte(4) ~= nil then -- Not tested
return (str:byte(1) - 0xF0) * 0x40000 return (str:byte(1) - 0xF0) * 0x40000
+ str:byte(2) % 0x40 * 0x1000 + str:byte(2) % 0x40 * 0x1000
+ str:byte(3) % 0x40 * 0x40 + str:byte(3) % 0x40 * 0x40
@ -117,6 +118,12 @@ function Font:get_next_char(text)
local codepoint = char_to_codepoint(text) local codepoint = char_to_codepoint(text)
if codepoint == nil then
minetest.log("warning",
"[font_api] Encountered a non UTF char, not displaying text.")
return nil, ''
end
-- Fallback mechanism -- Fallback mechanism
if self.widths[codepoint] == nil then if self.widths[codepoint] == nil then
local char = text:sub(1, bytes) local char = text:sub(1, bytes)
@ -175,6 +182,7 @@ function Font:get_width(line)
while line ~= "" do while line ~= "" do
codepoint, line = self:get_next_char(line) codepoint, line = self:get_next_char(line)
if codepoint == nil then return 0 end -- UTF Error
width = width + self:get_char_width(codepoint) width = width + self:get_char_width(codepoint)
end end
@ -247,6 +255,7 @@ function Font:render(text, texturew, textureh, style)
while line.text ~= '' do while line.text ~= '' do
codepoint, line.text = self:get_next_char(line.text) codepoint, line.text = self:get_next_char(line.text)
if codepoint == nil then return '' end -- UTF Error
-- Add image only if it is visible (at least partly) -- Add image only if it is visible (at least partly)
if x + self.widths[codepoint] >= 0 and x <= texturew then if x + self.widths[codepoint] >= 0 and x <= texturew then