From nobody Mon Feb 24 14:40:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z1k1T42z2z5pFPd; Mon, 24 Feb 2025 14:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1k1T2pVGz4QDY; Mon, 24 Feb 2025 14:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740408045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGRN9iVhPlZSmn0Hxn9NCU1LVYF3EUWEaiO78u+WCGE=; b=Vpd12morf1TnNiqHn/BsEdSSPBsMRj2MRup1AvHU0/nyRoDWm5cqhMytdJDncvoJdebxMl 2wxIp/LsJeGHa4ghgtz3Q2Td0qk6ac2REeo0/xu0/74FZ7zOmMSS3dayZguKWN1kzgjyVy lZrXdfZwcOXUxOCGV9FpiOZ7lbJN6WQdDY9DuXv1rzR9HS93oChmqKGLJ8IkC1Oq+Q+cp+ 7aBqQwMIxo3vq9UtfBaA+BV1YWfco5iWqT7KiFU0LsHJy2i17W5XKHSbCwGoJY7gLwC9nv 7IvFK44oCi2g4KEIe7cLkZRvyyGfVE/TyeZIAdgTqJEdYO6Fb6W8lyLZg9cdKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740408045; a=rsa-sha256; cv=none; b=qjWNyG+YgCd2sI7dnx/fa/NHNvbNyfe/n4gJgz0wwV1rxT9qqtik4oDQb1se1NIO/Mc7nx eTjovqzMFQRuPWsy9aufNQrLiPwCLcEziHLTDOFCis/pfJh0DLZtNqG5H7X3rBQxjG/+ht Wr6/VRODzDu3m+YzhoDgef6BAp6rtleKOPxqUGD09q+aB9IJAJJ4HloMWW2XBhbmF90RtJ S64SrZ1crHtbWfxLY+fQnttLtd/fdRnv3Zmpbr/OYd7+/LLF9LaLolkzfff/Pu2qBjRxqN XqA+XxyPW+tCOFDbDkyIjP/VNydbxUhk4iAvEY4dejNzoTE/2PBPeCcdtHS3ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740408045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGRN9iVhPlZSmn0Hxn9NCU1LVYF3EUWEaiO78u+WCGE=; b=hxfONBqYKlLWm8TLs0pgPDelUmbgoIQRTC1khNbzobzi9xipO/UpZERM1r/LRLnPNFnGlV GaoiTyD21OD/XuZEb2Zbhne5WKopBQsG8qxROeCZEqpenhz6fjoDYT1IH3Wx93jdNtpy8B HYzmBCmdayEYov9VvxLzhQxFD88f4r4SRhStYRAzgFG+YPrMXzFEs8cNzRnf7PziJzTs/f IBPXrT7P8kKOJSlo1icP2HGW/kaORH00cwYGvCrZNvaoutL+0b4hY9uZgfrKdFo/GNsyBh emYaZDRyoigyJMSkBb3+oNhRt93TmTQGITEz+B/Tu4luj/zlGJ3x6EGo/LbIPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z1k1T2NjszlW6; Mon, 24 Feb 2025 14:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51OEej9Q082001; Mon, 24 Feb 2025 14:40:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OEejYi081998; Mon, 24 Feb 2025 14:40:45 GMT (envelope-from git) Date: Mon, 24 Feb 2025 14:40:45 GMT Message-Id: <202502241440.51OEejYi081998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 7d1d7f42302d - main - stand: Fix brand positioning on framebuffer console List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d1d7f42302d80c33243501601b77323acc0717f Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=7d1d7f42302d80c33243501601b77323acc0717f commit 7d1d7f42302d80c33243501601b77323acc0717f Author: Jose Luis Duran AuthorDate: 2025-02-24 14:36:10 +0000 Commit: Jose Luis Duran 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