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 #28

Merged
merged 1 commit into from
Apr 22, 2024
Merged

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

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
45 changes: 25 additions & 20 deletions api.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,8 +470,8 @@ local math_max = math.max
local function fill_line(x, y, w, c, font_size, colorbgw)
c = c or "0"
local tex = { }
for xx = 0, math.max(0, w), colorbgw do
table.insert(tex, (":%d,%d=signs_lib_color_"..font_size.."px_%s.png"):format(x + xx, y, c))
for xx = x, w, colorbgw do
table.insert(tex, (":%d,%d=signs_lib_color_"..font_size.."px_%s.png"):format(xx, y, c))
end
return table.concat(tex)
end
Expand Down Expand Up @@ -583,8 +583,8 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
end
end
if w then
width = width + w + 1
if width >= (line_width - cwidth_tab[" "]) then
width = width + w
if width > line_width then
width = 0
else
maxw = math_max(width, maxw)
Expand All @@ -607,6 +607,7 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
off = ch_offs,
tex = tex,
col = ("%X"):format(cur_color),
w = w,
})
end
ch_offs = ch_offs + w
Expand All @@ -615,8 +616,8 @@ 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
if width >= (line_width - cwidth_tab[" "]) then
width = width + w
if width > line_width then
width = 0
else
maxw = math_max(width, maxw)
Expand All @@ -626,14 +627,15 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
off = ch_offs,
tex = char_tex(font_name, c),
col = ("%X"):format(cur_color),
w = w,
})
end
ch_offs = ch_offs + w
end
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 @@ -642,7 +644,8 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi

local texture = { }

local start_xpos = math.floor((line_width - maxw) / 2) + def.x_offset
local start_xpos = math.max(0, math.floor((line_width - maxw) / 2)) + def.x_offset
local end_xpos = math.min(start_xpos + maxw, line_width)

local xpos = start_xpos
local ypos = (line_height + def.line_spacing)* lineno + def.y_offset
Expand All @@ -651,31 +654,33 @@ 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))
if (xoffs > 0) and ((xoffs + word.w) > end_xpos) then
table.insert(texture, fill_line(xpos, ypos, end_xpos, "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, end_xpos, cur_color, font_size, colorbgw))
end
for ch_i, ch in ipairs(word.chars) do
if xpos + ch.off + ch.w > end_xpos then
table.insert(texture, fill_line(xpos + ch.off, ypos, end_xpos, "n", font_size, colorbgw))
break
end
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, end_xpos, cur_color, font_size, colorbgw))
end
table.insert(texture, (":%d,%d=%s"):format(xpos + ch.off, ypos, ch.tex))
end
table.insert(
texture,
(":%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
xpos = xpos + word.w
if xpos < end_xpos then
table.insert(texture, (":%d,%d="):format(xpos, ypos) .. char_tex(font_name, " "))
xpos = xpos + cwidth_tab[" "]
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, end_xpos, "n", font_size, colorbgw))

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