From nobody Sat Dec 28 18:56:53 2024 X-Original-To: dev-commits-src-all@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 4YLBRp4jTwz5j3Fn; Sat, 28 Dec 2024 18:56:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBRn5K25z52ww; Sat, 28 Dec 2024 18:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412213; 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=xZzsOLX/Zt9c7vqRB3samfXJJWSKi8odcL8sghIfCG8=; b=Qqf8pvdZNSRaLTTNfY2MpYvZS7Z7+/Id+sRiDcNb92jte6nJs422wAuGQ/mkafGXN4oDrF yg8W4OVB19HHpeTDUmdMtKZactZAmtK4oTbaQg2Bfi0Tn+TvL4aHCqPLxbg4iudNlQDf0k 0vOFHLaitEns2s2irQKxSBYNuD6iKzgBOelKylN+Rog18FxSR9D9DTuVt78Sxuxz/I3g79 EqFyZ1Gt8Z+SutTm1os6VoTdmrw4YarjxSdtG33qZ9wrsVf8jzdORFpOi4Zq450sct+6YR ELlry63wUu6iZD5meM+6QC8lmTWMc+Lor/hEIC9v6cOy0qbtPuaJReXaZozmvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412213; 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=xZzsOLX/Zt9c7vqRB3samfXJJWSKi8odcL8sghIfCG8=; b=tOCLPebVyJaBjoCQgg+BI8KqLrIQn6T81I9jw25vCsS5DUMLTKlQDnJ2rVGjfY3p8Ed9b9 DcN6hdCQT3gGLwziiaWcJjrjyS2yt94wSBT9QARBP34+pmaISPM9CHRjyBNtZ1KfaTOThP /hWLY8tWSXU4MLeXs55V7gsvZRt1V8qBMQ+lA/fFbtvi6BhHXEGlD6m4yQhwCQ6+4sd0C1 0w2cERBrODvUJQgfaNPX0XzVo/Dnhj/K/QX3BeXneuifN58tmPIrxq9BlLGeDSEyXfCJ8A 9IE9vrTLeClBafVdGFMcRhQZmECcSQY0C7zSWQvJrSZyAv7Bc2llVPcclXYH8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412213; a=rsa-sha256; cv=none; b=FS+lxCrCrASsL//uduOHLbt4gVhZtBimV2U0Hb0fArZ8jSvKYyCePLEfs882EI1KXNMKrs 0jit/TR21xLYMbAsIAGfL1Ag865BA2ys3m4Pb4bgeEs5Sy8KZnxL9K1wtBjyPgvx0cToCf 0tUzuOf8rCc12ZEC968JDX/iikkUER49UVEpqq/N2k7KqeKMq8Z1UKiCSQ8RUQFK1rF9qb fAZCRhmHWKzKYeTNQguPvpNBHKClA1eS8fpExeLR3+/3/KsMo9VWnth2UNXXKmuyyuo4fA L5Iq/YkwhnYnEbGUayljUu/PcrvYfkxwkqWxRUyrDKmS6MqWF97WD73zliBTKw== 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 4YLBRn3XQZzc12; Sat, 28 Dec 2024 18:56:53 +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 4BSIurYa038975; Sat, 28 Dec 2024 18:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIurq6038972; Sat, 28 Dec 2024 18:56:53 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:56:53 GMT Message-Id: <202412281856.4BSIurq6038972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 28e212c74050 - stable/14 - loader: Fix 0 vs 1 confusion for column numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 28e212c74050a019b0d0e0a4b0f0d6f222aeaad5 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=28e212c74050a019b0d0e0a4b0f0d6f222aeaad5 commit 28e212c74050a019b0d0e0a4b0f0d6f222aeaad5 Author: Warner Losh AuthorDate: 2024-09-24 19:54:56 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:14:41 +0000 loader: Fix 0 vs 1 confusion for column numbers In two places we use '0' for a column number. However, the upper left hand corner of the screen is 1, 1. Fix those two confusions. Also, fix a comment that flipped the coordinates in a comment (I'm used to the vt100 convention where it's row, column (eg y, x)) and didn't notice the rest of the code uses x, y. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46777 (cherry picked from commit 604919c47fa4092db08dadd282851afc9cba0a90) --- stand/lua/menu.lua | 4 ++-- stand/lua/screen.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 5820d80532b5..72f5648cae91 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -556,9 +556,9 @@ function menu.autoboot(delay) else -- Erase autoboot msg. While real VT100s -- wouldn't scroll when receiving a char with - -- the cursor at (24, 79), bad emulators do. + -- the cursor at (79, 24), bad emulators do. -- Avoid the issue by stopping at 79. - screen.setcursor(0, y) + screen.setcursor(1, y) printc(string.rep(" ", 79)) screen.defcursor() return ch diff --git a/stand/lua/screen.lua b/stand/lua/screen.lua index 4437a34f95f1..89d5416815fd 100644 --- a/stand/lua/screen.lua +++ b/stand/lua/screen.lua @@ -32,7 +32,7 @@ local core = require("core") local screen = {} -- Module exports -screen.default_x = 0 +screen.default_x = 1 screen.default_y = 25 function screen.clear()