From nobody Mon Mar 03 05:32:04 2025 X-Original-To: dev-commits-src-branches@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 4Z5nW913jBz5nhJR; Mon, 03 Mar 2025 05:32:05 +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 4Z5nW90XG1z3sZt; Mon, 03 Mar 2025 05:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740979925; 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=cahrw5t6PTzQYC2TIv7o5Nk6+TZpWVtyx/SuK0RXH/U=; b=PkJdVRMoQnmHvtnKCcZigI9zrgOs6Q1ZwezZ86NG58uwi7cQipOgLJKWgpPOi+DqHUdP/g HQv0vo9jmQOXErknRpbYSOQ3WXp0ndVE5nTVh2OdlLcA1O3UQbNGGUyM3DWaR8m5z3LDnN ulYC0ta/ByxDXGEY32KpYZy6oVNUZ1KLhgKsbpgjZFJtBgAcRygHFMmnwPGxuGc1OGDOmA vfVc2hl6EtHT73A/h34+K+Y6lr5cuP824Z4tp/DYCLTsrT8h8di88cx2tQLS500No4zfgY yYdTLojBLpatAlIwGRNF9k5VrDUft4R2kbrw3llgrT2KDe6vja5n26l0GpjzHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740979925; a=rsa-sha256; cv=none; b=hrnQ6QWF7jzKZHKl4Vm9ondwiHgJp8XAkxXGrDj5O5oNQI7Axiw144AAcFB+aomNg7otL1 LqUdVuWCSE2pf5/9AFMOCSUVW0iHddKuFiuZldgTkg5p/ht66Ja+wilZhpRd1MPoH5RZDU CNGqPFO+6O5nrZ7bOeAbAD3omPpSD/QO5iyx86N2ILKcf8sUGwQEuRBNBE1GCE6a3WLfpN ktRG2wvW//CUwHiTSJiooi2LSHifYFC34E3gfd24uNc8YXnpo78IDPab9z9haQEpnMDQnn fjYcyPVK+SRAvSr51o94bCmGU6USGhUpdrsVHQG2VahPhZWtvFbaYPnZsrq6Kg== 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=1740979925; 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=cahrw5t6PTzQYC2TIv7o5Nk6+TZpWVtyx/SuK0RXH/U=; b=QejS4RKEcAiS0Aeaq4iS/Z2wUZqO7sOhm8iYVvRgOybPL0RMXcC2owoeBSVgJBfRBjCkzE c4YYfbnm65C9Qr1YT5cICUtQN56XN1zD4I+9hFIodlxw/lv9P9efpZispALaKhxEacuvCl fVu7y7qfRQKCUYvmCETw2TL4i/v/HNpE/W0pgwBkTMbMJFs3KIv7hCqF31DbrqEfYjc73i SENo9N+SF8e7+ftra100DT2pp1KQ2SnCS9yqwBGEZhaZ3w8YzL/klf/QOVEpU6IJMGPO7X HqEscveiXtcVuKyiIkaOwHDc3IEFeBYhUrQi7Zc6IL2qkv5XnCx5vvvG9FojRg== 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 4Z5nW907yDzbVY; Mon, 03 Mar 2025 05:32:05 +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 5235W4dk013800; Mon, 3 Mar 2025 05:32:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5235W4CK013797; Mon, 3 Mar 2025 05:32:04 GMT (envelope-from git) Date: Mon, 3 Mar 2025 05:32:04 GMT Message-Id: <202503030532.5235W4CK013797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 8f652eb792ba - stable/14 - stand: Fix brand positioning on framebuffer console List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f652eb792baf5902a367f68ea02014fdc47313d Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=8f652eb792baf5902a367f68ea02014fdc47313d commit 8f652eb792baf5902a367f68ea02014fdc47313d Author: Jose Luis Duran AuthorDate: 2025-02-24 14:36:10 +0000 Commit: Jose Luis Duran CommitDate: 2025-03-03 05:29:47 +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 (cherry picked from commit 7d1d7f42302d80c33243501601b77323acc0717f) --- 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 e55702ffee6c..8c4307220642 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