Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Feb 2025 14:40:45 GMT
From:      Jose Luis Duran <jlduran@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 7d1d7f42302d - main - stand: Fix brand positioning on framebuffer console
Message-ID:  <202502241440.51OEejYi081998@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=7d1d7f42302d80c33243501601b77323acc0717f

commit 7d1d7f42302d80c33243501601b77323acc0717f
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-02-24 14:36:10 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2025-02-24 14:36:10 +0000

    stand: Fix brand positioning on framebuffer console
    
    The drawer.lua script ignores the values in loader_brand_x and
    loader_brand_y on framebuffer consoles, always positioning the brand at
    (1, 1).
    
    Allow it to be positioned by accepting the x and y values just like the
    text version.  For example:
    
    /boot/lua/gfx-nanobsd.lua:
    
        return {
            brand = {
                    graphic = {
                            ""
                    },
                    requires_color = true,
                    image = "/boot/images/freebsd-logo-rev.png"
            }
        }
    
    /boot/loader.conf.d/bootloader.conf:
    
        loader_logo="none"
        loader_brand="nanobsd"
        loader_brand_x="15"
    
    PR:             255202
    Reviewed by:    manu, imp
    Approved by:    emaste (mentor)
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D49092
---
 stand/lua/drawer.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua
index 2d04e29ac462..1bf741b2373e 100644
--- a/stand/lua/drawer.lua
+++ b/stand/lua/drawer.lua
@@ -327,7 +327,7 @@ local function drawbrand()
 	if core.isFramebufferConsole() and
 	    gfx.term_putimage ~= nil and
 	    branddef.image ~= nil then
-		if gfx.term_putimage(branddef.image, 1, 1, 0, 7, 0)
+		if gfx.term_putimage(branddef.image, x, y, 0, 7, 0)
 		then
 			return true
 		end



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502241440.51OEejYi081998>