Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix out-of-bounds textures in [combine #27

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Fix out-of-bounds textures in [combine #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions api.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,10 +467,11 @@ signs_lib.charwidth_wide32 = build_char_db(32)

local math_max = math.max

local function fill_line(x, y, w, c, font_size, colorbgw)
local function fill_line(x, y, w, c, font_size, colorbgw, line_width)
c = c or "0"
local tex = { }
for xx = 0, math.max(0, w), colorbgw do
for xx = 0, w, colorbgw do
if x + xx > line_width then break end
table.insert(tex, (":%d,%d=signs_lib_color_"..font_size.."px_%s.png"):format(x + xx, y, c))
end
return table.concat(tex)
Expand Down Expand Up @@ -583,9 +584,10 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
end
end
if w then
width = width + w + 1
width = width + w
if width >= (line_width - cwidth_tab[" "]) then
width = 0
break
else
maxw = math_max(width, maxw)
end
Expand Down Expand Up @@ -615,9 +617,10 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
else
local w = cwidth_tab[c]
if w then
width = width + w + 1
width = width + w
if width >= (line_width - cwidth_tab[" "]) then
width = 0
break
else
maxw = math_max(width, maxw)
end
Expand All @@ -633,7 +636,7 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
end
i = i + 1
end
width = width + cwidth_tab[" "] + 1
width = width + cwidth_tab[" "]
maxw = math_max(width, maxw)
table.insert(words, { chars=chars, w=ch_offs })
end
Expand All @@ -652,17 +655,16 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
for word_i, word in ipairs(words) do
local xoffs = (xpos - start_xpos)
if (xoffs > 0) and ((xoffs + word.w) > maxw) then
table.insert(texture, fill_line(xpos, ypos, maxw, "n", font_size, colorbgw))
xpos = start_xpos
ypos = ypos + line_height + def.line_spacing
lineno = lineno + 1
if lineno >= def.number_of_lines then break end
table.insert(texture, fill_line(xpos, ypos, maxw, cur_color, font_size, colorbgw))
table.insert(texture, fill_line(xpos, ypos, maxw, cur_color, font_size, colorbgw, line_width))
end
for ch_i, ch in ipairs(word.chars) do
if ch.col ~= cur_color then
cur_color = ch.col
table.insert(texture, fill_line(xpos + ch.off, ypos, maxw, cur_color, font_size, colorbgw))
table.insert(texture, fill_line(xpos + ch.off, ypos, maxw, cur_color, font_size, colorbgw, line_width))
end
table.insert(texture, (":%d,%d=%s"):format(xpos + ch.off, ypos, ch.tex))
end
Expand All @@ -671,11 +673,9 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
(":%d,%d="):format(xpos + word.w, ypos) .. char_tex(font_name, " ")
)
xpos = xpos + word.w + cwidth_tab[" "]
if xpos >= (line_width + cwidth_tab[" "]) then break end
end

table.insert(texture, fill_line(xpos, ypos, maxw, "n", font_size, colorbgw))
table.insert(texture, fill_line(start_xpos, ypos + line_height, maxw, "n", font_size, colorbgw))
table.insert(texture, fill_line(xpos, ypos, maxw, "n", font_size, colorbgw, line_width))
table.insert(texture, fill_line(start_xpos, ypos + line_height, maxw, "n", font_size, colorbgw, line_width))

return table.concat(texture), lineno
end
Expand Down