upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-12 18:20:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lualoader: adapt builtin brand/logo definitions as well

Browse source 
While these should be moved to the new format, it wasn't my intention
to force them over immediately.  Downstreams may embed their own brands
in drawer.lua, and we shouldn't break them for something like this.

Move adapt_fb_shim() up and use it for preloaded definitions to avoid
forcing the matter for now.  Perhaps in the future we'll start writing
out warnings for those that do need adapted.

Reported by:	0x1eef on IRC
This commit is contained in:
Kyle Evans 2025-06-18 10:12:54 -05:00
parent 9d0d55e398
commit abdbd85d1b
1 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
stand/lua/drawer.lua
View file

@ -101,6 +101,39 @@ local function processFile(gfxname)
return true
end
-- Backwards compatibility shims for previous FreeBSD versions, please document
-- new additions
local function adapt_fb_shim(def)
-- In FreeBSD 14.x+, we have improved framebuffer support in the loader
-- and some graphics may have images that we can actually draw on the
-- screen. Those graphics may come with shifts that are distinct from
-- the ASCII version, so we move both ascii and image versions into
-- their own tables.
if not def.ascii then
def.ascii = {
image = def.graphic,
requires_color = def.requires_color,
shift = def.shift,
}
end
if def.image then
assert(not def.fb,
"Unrecognized graphic definition format")
-- Legacy images may have adapted a shift from the ASCII
-- version, or perhaps we just didn't care enough to adjust it.
-- Steal the shift.
def.fb = {
image = def.image,
width = def.image_rl,
shift = def.shift,
}
end
def.adapted = true
return def
end
local function getBranddef(brand)
if brand == nil then
return nil
@ -123,6 +156,8 @@ local function getBranddef(brand)
end
branddef = branddefs[brand]
elseif not branddef.adapted then
adapt_fb_shim(branddef)
end
return branddef
@ -150,6 +185,8 @@ local function getLogodef(logo)
end
logodef = logodefs[logo]
elseif not logodef.adapted then
adapt_fb_shim(logodef)
end
return logodef
@ -511,37 +548,6 @@ drawer.default_bw_logodef = 'orbbw'
-- drawer module in case it's a filesystem issue.
drawer.default_fallback_logodef = 'none'
-- Backwards compatibility shims for previous FreeBSD versions, please document
-- new additions
local function adapt_fb_shim(def)
-- In FreeBSD 14.x+, we have improved framebuffer support in the loader
-- and some graphics may have images that we can actually draw on the
-- screen. Those graphics may come with shifts that are distinct from
-- the ASCII version, so we move both ascii and image versions into
-- their own tables.
if not def.ascii then
def.ascii = {
image = def.graphic,
requires_color = def.requires_color,
shift = def.shift,
}
end
if def.image then
assert(not def.fb,
"Unrecognized graphic definition format")
-- Legacy images may have adapted a shift from the ASCII
-- version, or perhaps we just didn't care enough to adjust it.
-- Steal the shift.
def.fb = {
image = def.image,
width = def.image_rl,
shift = def.shift,
}
end
return def
end
function drawer.addBrand(name, def)
branddefs[name] = adapt_fb_shim(def)
end